diff -Nru geany-0.17/aclocal.m4 geany-0.18/aclocal.m4 --- geany-0.17/aclocal.m4 2009-05-02 18:50:11.000000000 +0100 +++ geany-0.18/aclocal.m4 2009-08-16 18:29:18.000000000 +0100 @@ -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.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +[m4_warning([this file was generated for autoconf 2.64. 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'.])]) @@ -647,101 +647,187 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) -# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL +# serial 56 LT_INIT -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +LIBTOOL_DEPS="$ltmain" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL +_LT_SETUP +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl dnl -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH +_LT_CHECK_OBJDIR + +m4_require([_LT_TAG_COMPILER])dnl +_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -757,116 +843,653 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' # Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +double_quote_subst='s/\([["`\\]]\)/\\\1/g' # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + # Sed substitution to avoid accidental globbing in evaled expressions no_glob_subst='s/\*/\\\*/g' -# Constants: -rm="rm -f" - # Global variables: -default_ofile=libtool +ofile=libtool can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) +with_gnu_ld="$lt_cv_prog_gnu_ld" old_CC="$CC" old_CFLAGS="$CFLAGS" # Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - _LT_CC_BASENAME([$compiler]) # Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC + _LT_PATH_MAGIC fi ;; esac -_LT_REQUIRED_DARWIN_CHECKS +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from `configure', and `config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# `config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain="$ac_aux_dir/ltmain.sh" +])# _LT_PROG_LTMAIN -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the `libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) + + + + + +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) + + +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to `config.status' so that its +# declaration there will have the same value as in `configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) + + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags="_LT_TAGS"dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) -# _LT_AC_SYS_COMPILER +# _LT_CONFIG_COMMANDS # ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\[$]0 --fallback-echo"')dnl " + lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` + ;; +esac + +_LT_OUTPUT_LIBTOOL_INIT +]) + + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +cat >"$CONFIG_LT" <<_LTEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate a libtool stub with the current configuration. + +lt_cl_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AS_SHELL_SANITIZE +_AS_PREPARE + +exec AS_MESSAGE_FD>&1 +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2008 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test $[#] != 0 +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try \`$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try \`$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +if test "$no_create" != yes; then + lt_cl_success=: + test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" + exec AS_MESSAGE_LOG_FD>/dev/null + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false + exec AS_MESSAGE_LOG_FD>>config.log + $lt_cl_success || AS_EXIT(1) +fi +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +_LT_COPYING +_LT_LIBTOOL_TAGS + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + _LT_PROG_XSI_SHELLFNS + + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], [AC_REQUIRE([AC_PROG_CC])dnl +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} @@ -875,36 +1498,20 @@ # Allow CC to be a program name with arguments. compiler=$CC -])# _LT_AC_SYS_COMPILER - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -AC_DEFUN([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) +])# _LT_TAG_COMPILER # _LT_COMPILER_BOILERPLATE # ------------------------ # Check for compiler boilerplate output or warnings with # the simple compiler test code. -AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +$RM conftest* ])# _LT_COMPILER_BOILERPLATE @@ -912,39 +1519,57 @@ # ---------------------- # Check for linker boilerplate output or warnings with # the simple link test code. -AC_DEFUN([_LT_LINKER_BOILERPLATE], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* +$RM -r conftest* ])# _LT_LINKER_BOILERPLATE # _LT_REQUIRED_DARWIN_CHECKS -# -------------------------- -# Check for some things on darwin -AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ case $host_os in rhapsody* | darwin*) AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - echo "int foo(void){return 1;}" > conftest.c - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then - lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* - fi - rm conftest.c + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* fi]) AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], @@ -953,26 +1578,26 @@ echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" ]) case $host_os in - rhapsody* | darwin1.[[0123]]) + rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -982,10 +1607,10 @@ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' else - _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi if test "$DSYMUTIL" != ":"; then - _lt_dsymutil="~$DSYMUTIL \$lib || :" + _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= fi @@ -993,16 +1618,51 @@ esac ]) -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used + +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + m4_if([$1], [CXX], +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX +# ----------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl AC_LINK_IFELSE(AC_LANG_PROGRAM,[ lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -1017,45 +1677,45 @@ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX +])# _LT_SYS_MODULE_PATH_AIX -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [AC_DIVERT_PUSH(NOTICE)]) $1 AC_DIVERT_POP -])# _LT_AC_SHELL_INIT +])# _LT_SHELL_INIT -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- # Add some code to the start of the generated configure script which # will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[_LT_SHELL_INIT([ # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$ECHO in +case X$lt_ECHO in X*--fallback-echo) # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ;; esac -echo=${ECHO-echo} +ECHO=${lt_ECHO-echo} if test "X[$]1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. shift elif test "X[$]1" = X--fallback-echo; then # Avoid inline document here, it may be left over : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! : else # Restart under the correct shell. @@ -1065,9 +1725,9 @@ if test "X[$]1" = X--fallback-echo; then # used as fallback echo shift - cat </dev/null 2>&1 && unset CDPATH -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL [$]0 --fallback-echo" + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} else - # maybe with a smaller string... - prev=: + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi fi fi fi fi -fi # Copy echo and quote the copy suitably for passing to libtool from # the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" fi -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH +AC_SUBST(lt_ECHO) +]) +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], + [An echo program that does not interpret backslashes]) +])# _LT_PROG_ECHO_BACKSLASH -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], [AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -1203,12 +1866,12 @@ echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; esac fi rm -rf conftest* @@ -1217,79 +1880,79 @@ # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi fi rm -rf conftest* ;; x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; esac fi rm -rf conftest* @@ -1301,7 +1964,7 @@ CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -1317,7 +1980,7 @@ case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" fi ;; @@ -1327,30 +1990,63 @@ fi rm -rf conftest* ;; - -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; - ]) esac need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[AC_CHECK_TOOL(AR, ar, false) +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1]) + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= -])# _LT_AC_LOCK +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +])# _LT_CMD_OLD_ARCHIVE -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) # ---------------------------------------------------------------- # Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or @@ -1370,29 +2066,35 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi - $rm conftest* + $RM conftest* ]) if test x"[$]$2" = xyes; then - ifelse([$5], , :, [$5]) + m4_if([$5], , :, [$5]) else - ifelse([$6], , :, [$6]) + m4_if([$6], , :, [$6]) fi -])# AC_LIBTOOL_COMPILER_OPTION - +])# _LT_COMPILER_OPTION -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" @@ -1404,7 +2106,7 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1413,22 +2115,28 @@ $2=yes fi fi - $rm -r conftest* + $RM -r conftest* LDFLAGS="$save_LDFLAGS" ]) if test x"[$]$2" = xyes; then - ifelse([$4], , :, [$4]) + m4_if([$4], , :, [$4]) else - ifelse([$5], , :, [$5]) + m4_if([$5], , :, [$5]) fi -])# AC_LIBTOOL_LINKER_OPTION +])# _LT_LINKER_OPTION +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 @@ -1450,7 +2158,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -1505,7 +2213,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -1516,20 +2224,28 @@ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` fi ;; @@ -1540,27 +2256,35 @@ else AC_MSG_RESULT(none) fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) -# _LT_AC_CHECK_DLFCN -# ------------------ -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# --------------------------------------------------------------------- -AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl if test "$cross_compiling" = yes; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF [#line __oline__ "configure" #include "confdefs.h" @@ -1602,10 +2326,6 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif - void fnord() { int i=42;} int main () { @@ -1621,9 +2341,9 @@ else puts (dlerror ()); - exit (status); + return status; }] -EOF +_LT_EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? @@ -1638,13 +2358,13 @@ fi fi rm -fr conftest* -])# _LT_AC_TRY_DLOPEN_SELF +])# _LT_TRY_DLOPEN_SELF -# AC_LIBTOOL_DLOPEN_SELF -# ---------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -1660,15 +2380,15 @@ lt_cv_dlopen_self=yes ;; - mingw* | pw32*) + mingw* | pw32* | cegcc*) lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= - ;; + ;; cygwin*) lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= - ;; + ;; darwin*) # if libdl is installed we need to link against it @@ -1678,7 +2398,7 @@ lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) - ;; + ;; *) AC_CHECK_FUNC([shl_load], @@ -1720,7 +2440,7 @@ AC_CACHE_CHECK([whether a program can dlopen itself], lt_cv_dlopen_self, [dnl - _LT_AC_TRY_DLOPEN_SELF( + _LT_TRY_DLOPEN_SELF( lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) @@ -1728,8 +2448,8 @@ if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ]) @@ -1751,19 +2471,32 @@ *) enable_dlopen_self_static=unknown ;; esac fi -])# AC_LIBTOOL_DLOPEN_SELF +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $rm -r conftest 2>/dev/null + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null mkdir conftest cd conftest mkdir out @@ -1787,37 +2520,41 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi chmod u+w . 2>&AS_MESSAGE_LOG_FD - $rm conftest* + $RM conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out cd .. - rmdir conftest - $rm conftest* + $RM -r conftest + $RM conftest* ]) -])# AC_LIBTOOL_PROG_CC_C_O +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- # Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) hard_links="nottested" -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes - $rm conftest* + $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no @@ -1830,12 +2567,13 @@ else need_locks=no fi -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_OBJDIR], +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], [AC_CACHE_CHECK([for objdir], [lt_cv_objdir], [rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -1847,40 +2585,46 @@ fi rmdir .libs 2>/dev/null]) objdir=$lt_cv_objdir -])# AC_LIBTOOL_OBJDIR +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- # Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], [AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && + # We can hardcode non-existent directories. + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink + _LT_TAGVAR(hardcode_action, $1)=relink else # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate + _LT_TAGVAR(hardcode_action, $1)=immediate fi else # We cannot hardcode anything, or else we can only hardcode existing # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported + _LT_TAGVAR(hardcode_action, $1)=unsupported fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then # Fast installation is not supported enable_fast_install=no elif test "$shlibpath_overrides_runpath" = yes || @@ -1888,73 +2632,70 @@ # Fast installation is not necessary enable_fast_install=needless fi -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[striplib= +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" AC_MSG_RESULT([yes]) else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -fi - ;; - *) - AC_MSG_RESULT([no]) + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) ;; esac fi -])# AC_LIBTOOL_SYS_LIB_STRIP +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB -# AC_LIBTOOL_SYS_DYNAMIC_LINKER +# _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([LT_AC_PROG_SED])dnl +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl AC_MSG_CHECKING([dynamic linker characteristics]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -m4_if($1,[],[ +m4_if([$1], + [], [ if test "$GCC" = yes; then case $host_os in darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. @@ -1968,7 +2709,7 @@ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -1988,10 +2729,23 @@ if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" need_lib_prefix=unknown hardcode_into_libs=no @@ -2028,7 +2782,7 @@ aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then : else can_build_shared=no @@ -2054,9 +2808,18 @@ ;; amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac ;; beos*) @@ -2079,25 +2842,28 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ - $rm \$dlpath' + $RM \$dlpath' shlibpath_overrides_runpath=yes case $host_os in @@ -2106,20 +2872,20 @@ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; - mingw*) + mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH printed by # mingw gcc, but we are running on Cygwin. Gcc prints its search # path with ; separators, and with drive letters. We can handle the # drive letters (cygwin fileutils understands them), so leave them, # especially as we might pass files found there to a mingw objdump, # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi ;; pw32*) @@ -2143,13 +2909,13 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -2242,18 +3008,18 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH @@ -2330,6 +3096,17 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. @@ -2337,7 +3114,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -2366,7 +3143,7 @@ version_type=sunos need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' @@ -2387,14 +3164,16 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) - version_type=linux +*nto* | *qnx*) + version_type=qnx need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' ;; openbsd*) @@ -2403,13 +3182,13 @@ need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in openbsd2.[[89]] | openbsd2.[[89]].*) shlibpath_overrides_runpath=no @@ -2481,7 +3260,6 @@ sni) shlibpath_overrides_runpath=no need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' runpath_var=LD_RUN_PATH ;; siemens) @@ -2512,13 +3290,12 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes hardcode_into_libs=yes if test "$with_gnu_ld" = yes; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes case $host_os in sco3.2v5*) sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" @@ -2528,6 +3305,17 @@ sys_lib_dlsearch_path_spec='/usr/lib' ;; +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2542,288 +3330,58 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no -AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) +])# _LT_SYS_DYNAMIC_LINKER - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; - - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; - - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi -fi -])# _LT_AC_TAGCONFIG - - -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN - - -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 DLLs -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL - - -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - - -# AC_DISABLE_SHARED -# ----------------- -# set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED - - -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC - - -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC - - -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL - - -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL - - -# AC_LIBTOOL_PICMODE([MODE]) +# _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE - - -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - -# AC_PATH_TOOL_PREFIX -# ------------------- # find a file program which can recognize shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in @@ -2836,7 +3394,7 @@ dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" + ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do IFS="$lt_save_ifs" test -z "$ac_dir" && ac_dir=. @@ -2851,7 +3409,7 @@ $EGREP "$file_magic_regex" > /dev/null; then : else - cat <&2 + cat <<_LT_EOF 1>&2 *** Warning: the command libtool uses to detect shared libraries, *** $file_magic_cmd, produces output that libtool cannot recognize. @@ -2862,7 +3420,7 @@ *** may want to report the problem to your system manager and/or to *** bug-libtool@gnu.org -EOF +_LT_EOF fi ;; esac fi @@ -2879,37 +3437,47 @@ else AC_MSG_RESULT(no) fi -])# AC_PATH_TOOL_PREFIX +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) -# AC_PATH_MAGIC -# ------------- + +# _LT_PATH_MAGIC +# -------------- # find a file program which can recognize a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) else MAGIC_CMD=: fi fi -])# AC_PATH_MAGIC +])# _LT_PATH_MAGIC -# AC_PROG_LD +# LT_PATH_LD # ---------- # find the pathname to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH([gnu-ld], - [AC_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -2926,9 +3494,9 @@ [[\\/]]* | ?:[[\\/]]*) re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -2978,15 +3546,24 @@ AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_PROG_LD_GNU -])# AC_PROG_LD +_LT_PATH_LD_GNU +AC_SUBST([LD]) +_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) +])# LT_PATH_LD -# AC_PROG_LD_GNU -# -------------- -AC_DEFUN([AC_PROG_LD_GNU], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, +# Old names: +AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) +AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_LD], []) +dnl AC_DEFUN([AC_PROG_LD], []) + + +# _LT_PATH_LD_GNU +#- -------------- +m4_defun([_LT_PATH_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 /dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. @@ -3144,7 +3731,7 @@ ;; netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' @@ -3157,12 +3744,12 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx*) - lt_cv_deplibs_check_method=unknown +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all ;; openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3181,6 +3768,10 @@ lt_cv_deplibs_check_method=pass_all ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + sysv4 | sysv4.3*) case $host_vendor in motorola) @@ -3208,7 +3799,7 @@ esac ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +tpf*) lt_cv_deplibs_check_method=pass_all ;; esac @@ -3216,14 +3807,20 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -])# AC_DEPLIBS_CHECK_METHOD + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method == "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD -# AC_PROG_NM +# LT_PATH_NM # ---------- -# find the pathname to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" @@ -3265,16 +3862,51 @@ done IFS="$lt_save_ifs" done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + : ${lt_cv_path_NM=no} fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) -# AC_CHECK_LIBM -# ------------- + +# LT_LIB_M +# -------- # check for math library -AC_DEFUN([AC_CHECK_LIBM], +AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in @@ -3289,4015 +3921,4696 @@ AC_CHECK_LIB(m, cos, LIBM="-lm") ;; esac -])# AC_CHECK_LIBM +AC_SUBST([LIBM]) +])# LT_LIB_M +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -# (note the single quotes!). If your package is not flat and you're not -# using automake, define top_builddir and top_srcdir appropriately in -# the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that -# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -# and an installed libltdl is not found, it is assumed to be `libltdl'. -# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and top_srcdir -# appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -])# _LT_AC_LANG_CXX +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl -# _LT_AC_PROG_CXXCPP -# ------------------ -AC_DEFUN([_LT_AC_PROG_CXXCPP], +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [ -AC_REQUIRE([AC_PROG_CXX]) -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -fi -])# _LT_AC_PROG_CXXCPP - -# AC_LIBTOOL_F77 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 - +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] -# _LT_AC_LANG_F77 -# --------------- -AC_DEFUN([_LT_AC_LANG_F77], -[AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -])# _LT_AC_LANG_F77 +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -# AC_LIBTOOL_GCJ -# -------------- -# enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) -])# AC_LIBTOOL_GCJ +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac -# _LT_AC_LANG_GCJ -# --------------- -AC_DEFUN([_LT_AC_LANG_GCJ], -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -])# _LT_AC_LANG_GCJ +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -# AC_LIBTOOL_RC -# ------------- -# enable support for Windows resource files -AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([LT_AC_PROG_RC]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -])# AC_LIBTOOL_RC +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -AC_DEFUN([_LT_AC_LANG_C_CONFIG], -[lt_save_CC="$CC" -AC_LANG_PUSH(C) + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" -# Source file extension for C test sources. -ac_ext=c + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi -# Object file extension for compiled C test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext + # Check to see that the pipe works correctly. + pipe_works=no -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF - -# Report which library types will actually be built -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG - - -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - $as_unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - $as_unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi -if test "$GXX" = yes; then - # Set up default GNU C++ configuration + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif - AC_PROG_LD +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + cat <<_LT_EOF >> conftest.$ac_ext - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD fi else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 fi + rm -rf conftest* conftst* - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) else - GXX=no - with_gnu_ld=no - wlarc= + AC_MSG_RESULT(ok) fi -# PORTME: fill in a description of your system's C++ link characteristics -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -_LT_AC_TAGVAR(ld_shlibs, $1)=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +]) # _LT_CMD_GLOBAL_SYMBOLS - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +AC_MSG_CHECKING([for $compiler option to produce PIC]) +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else + case $host_os in + aix*) + # All AIX code is PIC. if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi - fi - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; + ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - darwin* | rhapsody*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; + esac + ;; - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) ;; *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - esac - ;; - freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + esac ;; - aCC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ;; *) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) ;; - *) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + hppa*64*|ia64*) + # +Z the default ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ;; esac - fi - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + ;; + esac ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC*) + # IBM XL 8.0 on PPC + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; esac ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - osf3*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + lynxos*) ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + m88k*) ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + netbsd* | netbsdelf*-gnu) ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + psos*) ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; - esac - fi - ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + esac ;; - esac - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + vxworks*) ;; *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ;; esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_POSTDEP_PREDEP($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -AC_LIBTOOL_CONFIG($1) + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -])# AC_LIBTOOL_LANG_CXX_CONFIG - -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; + esac + ;; -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - esac - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ;; - esac - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) -case " $_LT_AC_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac -])# AC_LIBTOOL_POSTDEP_PREDEP + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; -# AC_LIBTOOL_LANG_F77_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; -# Source file extension for f77 test sources. -ac_ext=f + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# Object file extension for compiled f77 test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" - -# Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + sysv4*MP*) + if test -d /usr/nec ;then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac fi - ;; +]) +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; esac -AC_MSG_RESULT([$enable_shared]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -_LT_AC_TAGVAR(GCC, $1)="$G77" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) -AC_LIBTOOL_CONFIG($1) +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_F77_CONFIG +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC -# AC_LIBTOOL_LANG_GCJ_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -[AC_LANG_SAVE +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= -# Source file extension for Java test sources. -ac_ext=java + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + esac -# Object file extension for compiled Java test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext + _LT_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE +_LT_EOF + fi + ;; -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -AC_LIBTOOL_CONFIG($1) + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_GCJ_CONFIG + gnu* | linux* | tpf* | k*bsd*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag= + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi -# AC_LIBTOOL_LANG_RC_CONFIG -# ------------------------- -# Ensure that the configuration vars for the Windows resource compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -[AC_LANG_SAVE + case $cc_basename in + xlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Source file extension for RC test sources. -ac_ext=rc + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; -# Object file extension for compiled RC test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_AC_SYS_COMPILER + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -_LT_AC_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_RESTORE -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_RC_CONFIG +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# AC_LIBTOOL_CONFIG([TAGNAME]) -# ---------------------------- -# If TAGNAME is not passed, then create an initial libtool script -# with a default configuration from the untagged config vars. Otherwise -# add code to config.status for appending the configuration named by -# TAGNAME from the matching tagged config vars. -AC_DEFUN([AC_LIBTOOL_CONFIG], -[# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - _LT_AC_TAGVAR(compiler, $1) \ - _LT_AC_TAGVAR(CC, $1) \ - _LT_AC_TAGVAR(LD, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ - _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ - _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ - _LT_AC_TAGVAR(old_archive_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ - _LT_AC_TAGVAR(predep_objects, $1) \ - _LT_AC_TAGVAR(postdep_objects, $1) \ - _LT_AC_TAGVAR(predeps, $1) \ - _LT_AC_TAGVAR(postdeps, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ - _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ - _LT_AC_TAGVAR(archive_cmds, $1) \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ - _LT_AC_TAGVAR(postinstall_cmds, $1) \ - _LT_AC_TAGVAR(postuninstall_cmds, $1) \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ - _LT_AC_TAGVAR(allow_undefined_flag, $1) \ - _LT_AC_TAGVAR(no_undefined_flag, $1) \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ - _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ - _LT_AC_TAGVAR(hardcode_automatic, $1) \ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ - _LT_AC_TAGVAR(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - - case $var in - _LT_AC_TAGVAR(old_archive_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi ;; esac - done - case $lt_echo in - *'\[$]0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` - ;; - esac - -ifelse([$1], [], - [cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - AC_MSG_NOTICE([creating $ofile])], - [cfgfile="$ofile"]) - - cat <<__EOF__ >> "$cfgfile" -ifelse([$1], [], -[#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no -# The names of the tagged configurations supported by this script. -available_tags= + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac -# ### BEGIN LIBTOOL CONFIG], -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -# Whether or not to build static libraries. -build_old_libs=$enable_static + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# An echo program that does not interpret backslashes. -echo=$lt_echo + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# A C compiler. -LTCC=$lt_LTCC + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + hpux9*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; -# An ERE matcher. -EGREP=$lt_EGREP + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# Whether we need hard or soft links. -LN_S=$lt_LN_S + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -# A BSD-compatible nm program. -NM=$lt_NM + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; -# A symbol stripping program -STRIP=$lt_STRIP + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE(int foo(void) {}, + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + ) + LDFLAGS="$save_LDFLAGS" + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" + *nto* | *qnx*) + ;; -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - -# Object file suffix (normally "o"). -objext="$ac_objext" + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Old archive suffix (normally "a"). -libext="$libext" + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -# Executable file suffix (normally ""). -exeext="$exeext" + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -# Additional compiler flags for building library objects. -pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -pic_mode=$pic_mode + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Must we lock files when doing compilation? -need_locks=$lt_need_locks + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; -# Do we need a version for libraries? -need_version=$need_version + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; -# Whether dlopen is supported. -dlopen_support=$enable_dlopen + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld -# Library versioning type. -version_type=$version_type +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) -# Format of library name prefix. -libname_spec=$lt_libname_spec +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) + ;; + esac + fi + ;; +esac -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], + [[If ld is used when linking, flag to hardcode $libdir into a binary + during linking. This must work even if $libdir does not exist]]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting ${shlibpath_var} if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [fix_srcfile_path], [1], + [Fix the shell variable $srcfile for the compiler]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC="$CC" +AC_LANG_PUSH(C) -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds +# Source file extension for C test sources. +ac_ext=c -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +# _LT_PROG_CXX +# ------------ +# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ +# compiler, we have our own version here. +m4_defun([_LT_PROG_CXX], +[ +pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) +AC_PROG_CXX +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_CXX -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_CXX], []) -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[AC_REQUIRE([_LT_PROG_CXX])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +# Source file extension for C++ test sources. +ac_ext=cpp -# This is the shared library runtime path variable. -runpath_var=$runpath_var +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -# This is the shared library path variable. -shlibpath_var=$shlibpath_var +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi -# How to hardcode a shared library path into an executable. -hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) + if test "$GXX" = yes; then + # Set up default GNU C++ configuration -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs + LT_PATH_LD -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) + else + GXX=no + with_gnu_ld=no + wlarc= + fi -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds + freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) + gnu*) + ;; -__EOF__ + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 will use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi -])# AC_LIBTOOL_CONFIG + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + xl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([LT_AC_PROG_SED]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=echo + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[[ABCDGIRSTW]]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do + output_verbose_link_cmd='echo' - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; - # Check to see that the pipe works correctly. - pipe_works=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' - rm -f conftest* - cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF ]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + else + prev= + fi + + if test "$pre_test_object_deps_done" = no; then + case $p in + -L* | -R*) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)="${prev}${p}" + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi + ;; + + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)="$p" + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)="$p" + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe else - AC_MSG_RESULT(ok) + echo "libtool.m4: error: problem compiling $1 test program" fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +$RM -f confest.$objext -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes ;; esac - else + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_PROG_F77 +# ------------ +# Since AC_PROG_F77 is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_F77], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) +AC_PROG_F77 +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_F77 + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_F77], []) + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_REQUIRE([_LT_PROG_F77])dnl +AC_LANG_PUSH(Fortran 77) + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_F77" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + CC=${F77-"f77"} + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler. - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; + ;; esac - fi -], + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" +fi # test "$_lt_disable_F77" != yes + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_PROG_FC +# ----------- +# Since AC_PROG_FC is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_FC], [ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) +AC_PROG_FC +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_FC + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_FC], []) + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_REQUIRE([_LT_PROG_FC])dnl +AC_LANG_PUSH(Fortran) + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_FC" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + CC=${FC-"f95"} + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; +# Source file extension for Java test sources. +ac_ext=java - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - hpux9* | hpux10* | hpux11*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; + _LT_CONFIG($1) +fi - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +AC_LANG_RESTORE - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - esac - ;; - esac - ;; +GCC=$lt_save_GCC +CC="$lt_save_CC" +])# _LT_LANG_GCJ_CONFIG - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - rdos*) - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC="$lt_save_CC" +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + - solaris*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; +# _LT_PROG_XSI_SHELLFNS +# --------------------- +# Bourne and XSI compatible variants of some useful shell functions. +m4_defun([_LT_PROG_XSI_SHELLFNS], +[case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} - sunos4*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} - unicos*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $[*] )) +} -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} + +_LT_EOF ;; -esac + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" -# -# Check to make sure the static flag actually works. -# -wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -]) +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - _LT_CC_BASENAME([$compiler]) - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; +dnl func_dirname_and_basename +dnl A portable version of this function is already defined in general.m4sh +dnl so there is no need for it here. + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; esac +} - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' +# sed scripts: +my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[[^=]]*=//' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` +} -EOF - fi - ;; +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$[@]"` +} - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +} - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +_LT_EOF +esac - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]+=\$[2]" +} +_LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]=\$$[1]\$[2]" +} - interix[[3-9]]*) - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_AC_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' - ;; +_LT_EOF + ;; + esac +]) - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. - if test $supports_anon_versioning = yes; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# serial 6 ltoptions.m4 - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac - bsdi[[45]]*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; +test -z "$AS" && AS=as +_LT_DECL([], [AS], [0], [Assembler program])dnl - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi - ;; +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +])# win32-dll - dgux*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED - hpux9*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - # Both c and cxx compiler support -rpath directly - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - solaris*) - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes fi - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + done + IFS="$lt_save_ifs" ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) ]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) + +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Do we need to explicitly link libc? +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +# 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. - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +# serial 6 ltsugar.m4 - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include -# #undef WIN32_LEAN_AND_MEAN -# #include -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) -# Cheap backport of AS_EXECUTABLE_P and required macros -# from Autoconf 2.59; we should not use $as_executable_p directly. +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) -# _AS_TEST_PREPARE -# ---------------- -m4_ifndef([_AS_TEST_PREPARE], -[m4_defun([_AS_TEST_PREPARE], -[if test -x / >/dev/null 2>&1; then - as_executable_p='test -x' -else - as_executable_p='test -f' -fi -])])# _AS_TEST_PREPARE -# AS_EXECUTABLE_P -# --------------- -# Check whether a file is executable. -m4_ifndef([AS_EXECUTABLE_P], -[m4_defun([AS_EXECUTABLE_P], -[AS_REQUIRE([_AS_TEST_PREPARE])dnl -$as_executable_p $1[]dnl -])])# AS_EXECUTABLE_P +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) + +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# Generated from ltversion.in. + +# serial 3012 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.2.6]) +m4_define([LT_PACKAGE_REVISION], [1.3012]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.2.6' +macro_revision='1.3012' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) ]) +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 4 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) + # nls.m4 serial 3 (gettext-0.15) dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation diff -Nru /tmp/H5qKeNSrz8/geany-0.17/ChangeLog /tmp/ssBwSf4GIv/geany-0.18/ChangeLog --- geany-0.17/ChangeLog 2009-05-02 18:47:42.000000000 +0100 +++ geany-0.18/ChangeLog 2009-08-16 18:27:01.000000000 +0100 @@ -1,9 +1,1016 @@ +2009-08-16 Enrico Tröger + + * src/document.c: + Add a translation hint to an ambiguous format string. + * src/Makefile.am: + Add missing include path to fix 'make distcheck'. + * src/win32.c: + Fix opening of local files in the browser on Windows. + * New release: Geany 0.18 "Kaine". + + +2009-08-15 Enrico Tröger + + * src/editor.c: + Temporarily disable reshowing calltips when the autocompletion + list was closed implicitly by not choosing an item to fix + problems with wrongly displayed calltips. + * src/template.c: + Add missing 'coding' cookie to the Python filetype template. + * doc/images/pref_dialog_edit_completions.png, + doc/images/pref_dialog_toolbar.png: + Update images for Geany 0.18. + + +2009-08-13 Enrico Tröger + + * wscript: + Add command '--hackingdoc' to create the HTML form of the + HACKING file. + + +2009-08-12 Frank Lanitz + + * po/pt_PT.po, po/LINGUAS: + Added a first Portugese (Portugal) translation based on work done at + launchpad by e.g. André Glória and Alexandre Jesus. + * src/main.c: Fix a minor typo on --help call. + + +2009-08-11 Nick Treleaven + + * src/highlighting.c: + Call get_keyfile_wordchars() in highlighting_init_styles(). + + +2009-08-09 Enrico Tröger + + * data/filetypes.ada: + Add missing file. + * src/keybindings.c: + Switching notebook tabs now works for the currently used notebook + widget instead of always using the documents notebook. + * src/document.c, src/document.h, src/documentprivate.h, + doc/plugins.dox: + Small corrections to some API docs. + + +2009-08-02 Enrico Tröger + + * src/build.c, src/win32.h, src/win32.c: + Expand system environment variables (%variableName%) on Windows when + running Build commands. + + +2009-07-30 Nick Treleaven + + * src/keybindings.c: + Rename 'Reflow lines/paragraph' to 'Reflow lines/block' because in + future using an indent block is more useful e.g. for ChangeLog + files. + * scintilla/LexMarkdown.cxx, scintilla/makefile.win32, + scintilla/include/SciLexer.h, scintilla/include/Scintilla.iface, + scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, + src/about.c, src/filetypes.c, src/filetypes.h, THANKS, + tagmanager/parsers.h, tagmanager/makefile.win32, + tagmanager/markdown.c, tagmanager/Makefile.am, wscript: + Add Markdown filetype (patch by Jon Strait, thanks). + * src/pluginprivate.h, src/pluginutils.c, src/plugins.c: + Fix disconnecting plugin signal id when not using geany_object. + * src/filetypes.c: + Add filetype_make_title() instead of using: + ft->title = g_strdup_printf(_("%s source file"), ft->name); + It also supports "%s file" strings. + + +2009-07-29 Nick Treleaven + + * src/pluginprivate.h, src/utils.h, src/plugindata.h, + src/stash.c, src/pluginutils.c, src/plugins.c, src/pluginutils.h, + doc/pluginsymbols.c, doc/plugins.dox, plugins/geanyfunctions.h, + plugins/filebrowser.c: + Add plugin_signal_connect() for connecting plugin signals at + runtime and also for connecting to any GObject signal. + Add 'Plugin Utility Functions' on main page. + Add foreach_array() macro. + * src/keybindings.c, src/sciwrappers.c, src/sciwrappers.h, + src/document.c, src/editor.c: + Rename 3 sci functions to sci_set_target_start(), + sci_set_target_end(), sci_replace_target() to match the SCI_ + message name. + + +2009-07-28 Frank Lanitz + + * wscript: Fix compiling error with waf. + + +2009-07-28 Nick Treleaven + + * src/pluginprivate.h, src/makefile.win32, src/plugindata.h, + src/pluginutils.c, src/plugins.c, src/pluginutils.h, + src/Makefile.am, wscript: + Move plugin_* utility functions to pluginutils.c. + Add pluginprivate.h. + * src/editor.c: + Fix reshowing calltip in the wrong document. + + +2009-07-25 Enrico Tröger + + * doc/geany.txt, doc/geany.html: + Add some general information about auto-completion capabilities + (patch by Lex Trotman, thanks). + + +2009-07-25 Frank Lanitz + + * po/LINGUAS, po/sl_SI.po, THANKS, src/about.c: + Added a first Slovenian translation. Thanks to Joze Klepec. + + +2009-07-24 Nick Treleaven + + * src/highlighting.c: + Use full styleset_foo[_init] function name as argument to + init_styleset_case() and styleset_case() macros so it's easier to + understand the code. + * src/keybindings.c, src/keybindings.h, src/sciwrappers.c, + src/sciwrappers.h, src/editor.c, src/editor.h, THANKS, + doc/geany.txt, doc/geany.html: + Add 'Reflow lines/paragraph' keybinding, defaults to Ctrl-J. + Heavily based on a patch by Eugene Arshinov (thanks). + Add sci_lines_split(), sci_lines_join(), sci_text_width(), + editor_strip_line_trailing_spaces(). + + +2009-07-24 Enrico Tröger + + * src/editor.c: + Attempt to fix reshowing calltips after the autocompletion list + has been shown. + 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, + plugins/splitwindow.c: + Change utils_str_remove_chars() to work in place; fix allocating on + the stack (the string length could exhaust the stack size). + * src/templates.c, src/build.c, src/utils.c, src/utils.h, + src/printing.c, src/callbacks.c: + Rename utils_str_replace() utils_str_replace_all(), setting a + 'gchar **haystack' argument instead of returning a new string. + * src/editor.c: + For the Tabs indent type, remove spaces when unindenting (only) if + there are no tabs on the line. + Group undo actions for (un)indenting of multiple lines. + * src/document.c, src/editor.c: + Fix scrolling horizontally after finding a search match with the + search bar or Find Next/Previous which is off-screen. + * src/keybindings.c: + Fix GLib warning when pressing a key with no documents open. + + +2009-07-21 Enrico Tröger + + * src/utils.c: + Start unifying usage of @a and @c markup elements in API docs, + to be continued. + * src/main.c, src/prefs.c, src/toolbar.c, src/toolbar.h: + Show/hide the toolbar without a restart when the setting in the + preferences dialog is changed (closes #2824785). + * src/dialogs.c, src/document.c, src/editor.c, src/encodings.c, + src/filetypes.c, src/keybindings.h, src/main.c, src/msgwindow.c, + src/navqueue.c, src/plugindata.h, src/prefs.c, src/toolbar.c, + src/toolbar.h: + Continue unifying usage of @a and @c markup elements in API docs. + + +2009-07-21 Nick Treleaven + + * src/document.c: + Remove relative/untidy path elements when creating new documents + with a filename (e.g. from the command-line) (#2823998). + + +2009-07-20 Enrico Tröger + + * src/callbacks.c: + Disable 'Recent Projects' menu item if the list of recent projects + is empty. + * src/win32.c: + Fix some harmless compiler warnings. + * plugins/geanyfunctions.h, plugins/splitwindow.c, src/plugindata.h, + src/plugins.c, src/utils.c, src/utils.h: + Move utils_str_remove_chars() from the plugins/splitwindow.c to + src/utils.c and add it to the plugin API. + Make utils_str_remove_chars() work on a new copy of the input string + instead of modifying it in place. + * src/toolbar.c: + Remove underscores from the toolbar items labels. + * src/utils.c: + Fix typos. + * plugins/splitwindow.c: + Fix broken 'Show the current document' tool button icon. + + +2009-07-20 Nick Treleaven + + * src/treeviews.c, src/callbacks.c, src/stash.c, src/stash.h, + src/keyfile.c: + Add stash_group_add_widget_property() so we can save any widget's + read/write properties. + Use Stash for ui_prefs.sidebar_page setting. + * src/utils.h, src/prefs.c, src/keyfile.c, src/symbols.c: + Make foreach_ptr_array() use an integer argument for its + implementation, as this is more useful potentially than a gpointer* + argument, and more straightforward. + Add foreach_c_array(), foreach_ptr_array() to API. + * src/utils.c, src/utils.h, src/document.c: + Remove relative/untidy path elements when opening documents (closes + #2823998). + * src/treeviews.c: + Fix showing project name for documents list files with no + subdirectory (oops). + * src/dialogs.c: + Fix checking whether to overwrite when using the Rename button in + the 'Save As' dialog. + + +2009-07-19 Enrico Tröger + + * src/dialogs.c: + Don't use the main window as parent for dialog boxes if it is not + yet realised. + Set titles for message dialogs. + + +2009-07-18 Enrico Tröger + + * src/toolbar.c: + Display item labels instead of raw names in the toolbar editor. + Apply changes in the toolbar editor instantly. + Show icons in the toolbar editor. + Speed up toolbar editor dialog creation. + * src/templates.c: + Improve inserting of comment templates like File header or licence + notices. The comment information are now read from the filetype + configuration files. + + +2009-07-16 Enrico Tröger + + * src/document.c: + Enable file monitoring for files which are written to disk by Geany + for the first time. + * src/filetypes.c: + Fix broken special case handling when detecting filetypes from a + shebang or other special file headers. + + +2009-07-16 Nick Treleaven + + * src/search.c: + Make Mark All keybinding clear search highlighting when there's no + current word. + * src/search.c: + Fix wrong match length when using Mark with regex. + * src/geanyobject.c, src/geanyobject.h, src/treeviews.c, + src/keyfile.c, src/main.c: + Add 'Show Paths' documents list popup item. + Add "load_settings" core-only signal emitted just after loading + main keyfile settings; useful to delay building UI elements until + settings have been read. + * src/treeviews.c: + Fix GTK warning when right-clicking on default tag tree. + * src/treeviews.c, src/treeviews.h, src/keyfile.c, src/main.c: + Add treeviews_finalize(). + Remove tv.popup_openfiles field. + + +2009-07-15 Nick Treleaven + + * src/highlighting.c: + Fix building on GTK 2.8 (patch by Eugene Arshinov, thanks). + + +2009-07-14 Enrico Tröger + + * src/utils.c: + Quote the uri before passing it to the browser when opening a + website (closes #2818635). + * src/win32: + Fix broken 'builtin' Run command for HTML files on Windows. + + +2009-07-14 Nick Treleaven + + * src/editor.c: + Properly fix wrong brace highlighting of non-brace character. + * src/editor.c: + Allow autocompletion in Perl double-quoted strings. + Don't autocomplete in Perl single-quoted strings (closes #2821061). + Don't autocomplete in Perl q() strings. + * data/filetypes.common: + Make Mark highlighting brighter. + * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade: + Use hyphen for auto-feature terms. + * src/plugindata.h, src/geany.h, src/filetypes.c, src/filetypes.h, + src/document.h, src/main.c: + Add documents_foreach() API macro that skips invalid docs. + Make filetypes[], documents[] part of the API again. + Add GEANY() macro for sharing geany symbols between API and core. + * src/plugindata.h, src/plugins.c, doc/plugins.dox, + plugins/saveactions.c, plugins/export.c, plugins/geanyfunctions.h, + plugins/demoplugin.c, plugins/filebrowser.c, plugins/splitwindow.c, + plugins/htmlchars.c, plugins/geanyplugin.h, plugins/Makefile.am, + plugins/classbuilder.c, wscript: + Add geanyplugin.h single include for plugin API; update all core + plugins to use it. + Add sci_set_font() to API. + Update plugin howto. + * src/filetypes.c, src/filetypes.h: + Remove filetypes_foreach_named(). + + +2009-07-13 Nick Treleaven + + * src/highlighting.c, src/about.c, src/filetypes.c, src/document.c, + src/document.h, src/main.c, THANKS: + Apply patch from Eugene Arshinov to reload color schemes via menu + (thanks). + * src/filetypes.c: + Reload filetypes.common after saving it. + * src/editor.c: + Improve wrong brace highlighting of non-brace character. + + +2009-07-10 Nick Treleaven + + * src/editor.c: + Delay highlighting matching braces by 100ms, which speeds up + scrolling with the arrow keys. + * src/keybindings.c, src/keybindings.h, src/search.c, src/search.h: + Add 'Mark All' keybinding. + * tagmanager/diff.c: + Show relative paths in diff filename tags. + + +2009-07-09 Enrico Tröger + + * src/highlighting.c: + Fix setting keyword list 'classes' for Haxe + (pointed out by Andreas Mokros, thanks). + + +2009-07-09 Nick Treleaven + + * src/interface.c, src/keyfile.c, src/editor.c, src/editor.h, + doc/geany.txt, doc/geany.html, geany.glade: + Add 'Drop rest of word on completion' pref. + * src/editor.c, doc/geany.txt, doc/geany.html: + If autocompletion is already visible when forcing completion, show + document word completion instead of tag completion. + Docs: Minor edits of related prefs items. + * src/printing.c, src/dialogs.c, src/dialogs.h, src/plugindata.h: + Add warning when printing and editor font is not monospaced. + Fix using GtkMessageType instead of gint param for + dialogs_show_msgbox*(). + Add missing G_GNUC_PRINTF macro check to API dialog funcs. + * src/editor.c: + Support 'tab indents, space aligns' style for auto-indentation + (closes #2789109). + + +2009-07-08 Enrico Tröger + + * src/document.c, src/documentprivate.h: + Rework the GIO based file monitoring code. Now it is used only + to indicate a possible change of the file, the real check if the + file has been changed is performed by stat(). + * data/filetypes.common, doc/geany.txt, src/highlighting.c: + Add style 'line_height' to increase the line height. + Add style 'marker_mark' and change style 'marker_search' to + define the style used for marked search results. + * doc/geany.txt, doc/geany.html: + Add the new 'Autocomplete all words in document' pref to the docs. + + +2009-07-08 Nick Treleaven + + * src/interface.c, src/keyfile.c, src/editor.c, src/editor.h, + doc/geany.txt, doc/geany.html, geany.glade, TODO: + Add 'Autocomplete all words in document' pref. + Use 'autocompletion' in dialog and docs, not 'auto completion'. + * src/editor.c: + Fix limiting number of word completion entries too much. + * src/editor.c, TODO, icons/16x16/classviewer-var.xpm, + icons/16x16/classviewer-method.xpm, icons/16x16/Makefile.am: + Show autocompletion icons for tag symbols - for now only tags with + an arglist have the 'function/method' icon, all others have the + 'variable' icon. + Note: XPMs were created from the PNGs with the ImageMagick 'convert' + program. + * src/highlighting.c: + Highlight D WYSIWYG backtick `strings` and r"strings" (closes + #1895745). + + +2009-07-06 Nick Treleaven + + * src/highlighting.c, src/utils.h, plugins/splitwindow.c: + Fix removing underscores in translated string using no_underscore() + macro. + Set a tooltip for the Split Window plugin's Show Current tool button. + Add utils_strdupa() macro. + * src/interface.c, geany.glade: + Use stock Select All icon now we have >= GTK 2.8. + * src/treeviews.c: + Fix using project name for document items that start with the + project base path but don't match it e.g. ".../geany-plugins" + instead of ".../geany" when project name is 'geany'. + + +2009-07-04 Enrico Tröger + + * src/build.c: + Fix warnings when the toolbar does not contain the Run button. + * tagmanager/lua.c: + Fix wrong parsing of complex expressions in the Lua parser. + * src/editor.c, src/geany.h, src/keybindings.c, src/plugindata.h, + src/utils.c: + Remove unnecessary enums. + * scintilla/*, scintilla/include/*, src/plugindata.h: + Update Scintilla to version 1.79. + * src/document.c, src/editor.c, src/sciwrappers.c, src/sciwrappers.h, + src/search.c: + Use the new Scintilla struct names prefixed with 'Sci_'. + * TODO, data/filetypes.common, doc/geany.html, doc/geany.txt, + src/highlighting.c: + Add second argument to the 'line_wrap_indent' styling setting to + control the new Scintilla indentation mode for wrapped lines. + * src/toolbar.c: + Properly close the toolbar editor on delete-events. + Fix warnings and possible crashes in the toolbar editor when the list + of displayed toolbar items is empty. + * data/filetypes.tcl: + Update Tcl keywords for Tcl 8.6 (patch by Witek Mozga, thanks). + * src/plugins.c: + Make the plugin manager dialog a bit bigger. + + +2009-06-30 Enrico Tröger + + * doc/geany.html, doc/geany.txt: + Fix wrong default values for the 'Show Calltip' keybinding. + + +2009-06-29 Enrico Tröger + + * data/filetypes.tcl, src/symbols.c: + Fix duplicate "context_action_cmd" key. + Use different icons for "Methods" and "Procedures" in the symbol + list for Tcl files. + * src/filetypes.c: + Fix a small memory leak. + * doc/geany.html, doc/geany.txt, src/editor.c, src/keybindings.c, + src/keybindings.h, src/plugindata.h: + Make the Scintilla keybindings 'Delete to end of line' and + 'Go to end of display line' configurable. + * geany.nsi: + Fix a typo (closes #2813624). + + +2009-06-28 Enrico Tröger + + * tagmanager/tcl.c, src/symbol.c: + Improve parsing of Tcl files (parsing new Tcl8.6 style classes, + methods and namespaces). + Patch by Witek Mozga, thanks. + + +2009-06-25 Enrico Tröger + + * data/ui_toolbar.xml, doc/geany.txt, doc/geany.html, src/ui_utils.c, + src/toolbar.c, src/toolbar.h: + Remove ui_toolbar.xml Configuration Files menu item. + Add a real toolbar editor dialog. + * geany.glade, src/callbacks.c, src/callbacks.h, src/interface.c, + src/prefs.c: + Add a button in the preferences dialog and an item for the toolbar + popup menu to run the toolbar editor dialog. + + +2009-06-25 Nick Treleaven + + * src/dialogs.c: + Fix Gtk NULL warning with gtk_file_chooser_set_current_folder(). + Fix using locale encoding for default Save As dialog path. + * src/editor.c: + Beep when trying to activate the '...' autocompletion item. + Limit (forced) document word completion to + autocompletion_max_entries. + Beep if no completions are shown when forcing autocompletion. + + +2009-06-24 Enrico Tröger + + * data/ui_toolbar.xml, src/toolbar.c: + Add 'Build' toolbar button to the default layout. + + +2009-06-24 Nick Treleaven + + * src/editor.c: + If forcing autocompletion and there's nothing else to show, complete + from words in the current document (using code from Enrico's + 'AutoComplete Test' plugin). + + +2009-06-23 Nick Treleaven + + * src/plugins.c: + Add debug message if plugin has not set a name for its keybinding + group. + * data/filetype_extensions.conf: + Add *.m4 for shell scripts. + + +2009-06-22 Nick Treleaven + + * src/highlighting.c, doc/geany.txt, doc/geany.html, + data/filetypes.common, TODO: + Make filetypes.common named styles use the "default" named style for + all missing style fields. + Set named styles to usually leave the background style empty. This + currently allows C-like filetypes to have a common default + background color. + Allow hard-coded colors to use -1 for the default color. + Add some highlighting style examples to the manual. + + +2009-06-21 Enrico Tröger + + * src/templates.c: + Create initial template files with proper platform-specific line + ending characters. + + +2009-06-20 Enrico Tröger + + * data/ui_toolbar.xml, doc/geany.txt, src/build.c, + src/geanymenubuttonaction.c, src/geanymenubuttonaction.h, src/main.c, + src/plugins.c, src/templates.c, src/toolbar.c, src/toolbar.h, + src/ui_utils.c, src/ui_utils.h: + Instantly reload (i.e. rebuild) the toolbar when ui_toolbar.xml is + saved within Geany. + Refactor some related code. + * tagmanager/conf.c: + Strip trailing spaces from "Key" tags. + * geany.nsi: + Quote the full filename to the Geany executable when creating the + "Open with Geany" context menu item. + * plugins/splitwindow.c: + Avoid using deprecated GTK API. + * src/log.c, src/main.c: + Properly clean up the logging mechanism. + * src/build.c: + Fix LaTeX view commands on Windows (part of #2807688). + * src/prefs.c: + Add a popup menu for the keybinding list in the preferences dialog + to easily expand and collapse all groups. + Refactor the keybindings code for the preferences dialog, prefix all + related functions. + * src/main.c, src/ui_utils.c, src/ui_utils.h: + Init stock items before creating the toolbar (closes #2809324). + * wscript: + Generate the geany.pc file also on Windows. + * src/ui_utils.c: + Invert the logic to determine which Save All we want to use: + Use the Tango like icon only for the Tango theme and the Gnome / GTK + like icon for any other themes. + + +2009-06-18 Nick Treleaven + + * src/highlighting.c, README.Packagers, HACKING: + Remove gsd_* default styles, use named styles instead. + Note: this relies on filetypes.common being installed. + Add load_style_entries(), which makes style initialization + simpler, used in styleset_c_like_init(). + + +2009-06-17 Enrico Tröger + + * src/win32.c: + Prevent possible crash on Windows when not setting an initial + directory for native File Open/Save dialogs. + * data/filetypes.xml, src/highlighting.c: + Add style 'jscript_regex' for filetype HTML + (patch by Chris Macksey, thanks). + + +2009-06-17 Nick Treleaven + + * src/filetypes.h, src/document.c, src/document.h, src/ui_utils.c: + Make GeanyDocument::file_type always be non-NULL, even for a new + document with no filetype set. + * src/editor.c: + Only autocomplete scope for scopes matching the current filetype's + language. + * data/filetypes.java, data/filetypes.cpp, data/filetypes.vala, + data/filetypes.haxe, data/filetypes.common, data/filetypes.glsl, + data/filetypes.actionscript, data/filetypes.cs, + data/filetypes.ferite, data/filetypes.c, data/filetypes.d, + data/filetypes.javascript, HACKING: + Make C++, D lexer filetypes use named styles (apart from uuid, + verbatim, regex styles). + + +2009-06-16 Enrico Tröger + + * src/dialogs.c: + Don't explicitly change the current directory of the Save As dialog + so that it uses the last used directory. + + +2009-06-14 Enrico Tröger + + * src/encodings.c, src/encodings.h, src/plugindata.h: + Add Japanese encoding "CP932" (patch by Ryūsei Yamaguchi, thanks). + * src/editor.c: + Remove dead code. + When completing from the macro list, put the cursor after + the inserted text. + + +2009-06-12 Nick Treleaven + + * tagmanager/pascal.c: + Fix type definitions being parsed as functions. + * src/editor.c: + Don't autocomplete in unterminated strings as well. + * src/templates.c, src/utils.h, src/dialogs.c, src/plugindata.h, + src/filetypes.c, src/ui_utils.c, plugins/saveactions.c: + Remove data_ptr argument to foreach_[s]list() macros, as using + node->data is enough sometimes; this makes the macro a bit more + efficient too. + Add foreach_[s]list() macros to the plugin API docs. + + +2009-06-11 Nick Treleaven + + * scintilla/LexPascal.cxx: + Backport fix from Scintilla CVS: + Pascal lexer hanging on file that starts with 'interface' after + whitespace. + + +2009-06-11 Enrico Tröger + + * waf: + Update Waf to 1.5.7. + * wscript: + Overwrite installation prefix on Windows only if it wasn't + specified explicitly. + + +2009-06-10 Enrico Tröger + + * src/editor.c: + Display calltips for Pascal symbols in the Pascal way (#2803945). + * tagmanager/pascal.c: + Fix wrongly set return values for procedures (closes #2803945). + * doc/Doxyfile.in, tagmanager/include/tm_work_object.h, + tagmanager/include/tm_source_file.h, + tagmanager/include/tm_workspace.h: + Fix doxygen warnings. + + +2009-06-10 Nick Treleaven + + * src/editor.c, tagmanager/include/tm_workspace.h, + tagmanager/tm_workspace.c, TODO: + Autocomplete scoped fields like struct members when typing '.' (and + also '->' or '::' in C/C++). + Save all tag types for C/C++ when generating a global tags file, so + we can use autocompletion for structs also. + Merge tm_workspace_find_scope_members(), + tm_workspace_find_namespace_members() (currently not built) from + Anjuta 2.24.1 tagmanager. + + +2009-06-09 Enrico Tröger + + * tagmanager/pascal.c: + Parse Pascal calltips (closes #2802640). + + +2009-06-09 Nick Treleaven + + * src/filetypes.c, src/ui_utils.c: + Add filetypes.common Configuration Files menu item. + + +2009-06-08 Enrico Tröger + + * src/callbacks.c: + Add backslash to the wordchars on Windows when using + 'Open Selected File'. + * src/wscript: + Add support (configure, build and install) for building on Windows + and cross-compiling for Windows using the Waf build system. + + +2009-06-05 Nick Treleaven + + * src/toolbar.c: + Set status bar text instead of showing a dialog when saving + ui_toolbar.xml because the user might save several times. + * src/editor.c: + Fix redrawing due to colourising just after the document is first + drawn. Now colourising should happen before the first draw. + * src/utils.c, src/highlighting.c, data/filetypes.common: + Fix segfault on parsing a filetypes.* style definition that has < 4 + fields. + Allow style definitions to have missing fields to use the default + style fields. + + +2009-06-05 Enrico Tröger + + * src/images.c, src/about.c, src/ui_utils.c, THANKS: + Add a more Tango like icon for 'Save All' (by Jesse Mayes, thanks). + * plugins/classbuilder.c: + Fix wrongly created header guards when the class filenames contains + dashes (patch by PCMan, thanks). + * data/filetypes.matlab: + Add build_settings section to allow executing Matlab scripts. + * src/document.c: + When closing a document, mark it as invalid before removing it from + the documents notebook (this fixes wrong Save All button state when + closing an unsaved document because the "switch-page" signal handler + was using old data). + + +2009-06-03 Nick Treleaven + + * src/highlighting.c, doc/geany.txt, doc/geany.html: + Support toggling bold/italic when using a named style, e.g.: + commentdockeyword=commentdoc,bold,italic + Improve named style docs. + + +2009-06-01 Enrico Tröger + + * src/build.c, src/editor.c: + Fix crashes when parsing the output of a compiler which reports + errors on line 0. + + +2009-06-01 Nick Treleaven + + * src/highlighting.c: + Support named styles also for filetypes.common [styling] entries. + * doc/geany.txt, doc/geany.html, HACKING: + Update docs for named styles in filetypes.* files. + * src/symbols.c: + Fix grouping symbol list children when parent name has "." character + in for reStructuredText and Conf filetypes. + * tagmanager/python.c: + Fix grouping functions/classes under a nested function. + + +2009-05-30 Enrico Tröger + + * geany.spec.in: + Adjust icon paths (patch by Dominic Hopf, thanks). + * doc/geany.txt, doc/geany.html, src/toolbar.c: + Add 'Replace' toolbar button (closes #2798225). + + +2009-05-30 Nick Treleaven + + * src/utils.c, src/highlighting.c, TODO: + Implement named styles support for filetypes.* using a + filetypes.common [named_styles] section e.g.: + foo=0xc00000;0xffffff;false;true + bar=foo + These can be used in e.g. filetypes.c as: + comment=foo + + +2009-05-28 Enrico Tröger + + * src/ui_utils.c: + Fix wrong sensitiveness of the Redo buttons (closes #2797862). + + +2009-05-28 Frank Lanitz + + * THANKS, src/about.c, po/lb.po, po/LINGUAS: + Added Luxembourgian translation. Huge thanks to Laurent Hoeltgen. + + +2009-05-27 Enrico Tröger + + * src/build.c: + Remove quote_executable() as it is not used anymore. + When creating the geany_run_script.bat use the "%0" variable + expansion and quote it for the "del" command (closes #2797172). + * src/win32.c: + On Windows, fallback to the literal build command line if searching + for the command in the system path failed (related to #2795923). + Properly terminate the resulting strings when reading the stdout + and stderr of any spawned commands on Windows. + + +2009-05-26 Enrico Tröger + + * src/win32.c: + Use the wide character versions of native Windows File dialogs. + * src/project.c: + Fix wrong initialisation of the default project path button callback + in the preferences dialog. + * Makefile.am, configure.in, geany.nsi, geany.spec.in, wscript, + geany_private.rc, icons/16x16/Makefile.am, icons/16x16/geany.png, + icons/48x48, icons/48x48/Makefile.am, icons/48x48/geany.png, + icons/Makefile.am, icons/geany.ico, icons/scalable, + icons/scalable/Makefile.am, icons/scalable/geany.svg, + src/makefile.win32: + Move the icons geany.png and geany.ico into the icons directory. + Add a 16x16 pixel Geany icon and the scalable SVG icon. + Drop the pixmaps directory. + + +2009-05-22 Nick Treleaven + + * src/keybindings.c: + Improve MRU document switching so there are no duplicates in the + list and documents switched to whilst the dialog is open are + ignored. Also beep when cycling through to the first document in the + list. + + +2009-05-21 Enrico Tröger + + * src/dialogs.c: + Fix broken 'Cancel' button in the Save As dialog. + + +2009-05-20 Nick Treleaven + + * src/editor.c: + Fix multiline indent when selection covers text on the last line. + * src/notebook.c: + Show current document in bold in tab popup menu. + * src/editor.c, tagmanager/python.c, TODO: + Parse Python calltips. + + +2009-05-19 Enrico Tröger + + * src/symbols.c, tagmanager/python.c: + Parse Python import statements to get symbol completion for the + imported module names. + * src/editor.c, src/editor.h: + Make some only locally used functions static. + Fix wrong sanity check. + * src/build.c: + Fix quoting the build command string on Windows (closes #2791769). + This broke when we made build commands run synchronously on Windows, + now we don't need to special quote the commands anymore. + + +2009-05-19 Nick Treleaven + + * src/editor.c: + Drop rest of word to the right of cursor when autocompleting (do we + need a pref for this?). + + +2009-05-18 Nick Treleaven + + * src/sciwrappers.c, src/sciwrappers.h, src/editor.c: + Add sci_set_selection(). + * doc/geany.txt, doc/geany.html: + Update manual for MRU switching. + * src/callbacks.c, src/editor.c, src/editor.h: + Make indenting with the Tabs indent type preserve spaces on the line, + so it works for the 'tab indents, space aligns' formatting style. + + +2009-05-17 Enrico Tröger + + * tagmanager/python.c: + Fix missing symbols for variables when an equal sign is used + in a comment on the same line as the variable declaration. + Backport change from CTags SVN to keep the parser more in sync: + Add support for Cython constructs to the Python parser. + * src/search.c: + Remember the additional Find in Files search flags at startup. + * src/dialogs.c: + Don't close the Save As dialog when saving the file didn't succeed. + + +2009-05-13 Nick Treleaven + + * src/keyfile.c: + Remember scribble cursor position. + * src/keybindings.c, TODO: + Implement Most-Recently-Used document switching when pressing + Ctrl-Tab keybinding. (It's probably not perfect, but works OK). + + +2009-05-13 Frank Lanitz + + * data/latex.tags: Added some more commands from unit.sty and + moderncv.sty. + + +2009-05-12 Nick Treleaven + + * src/symbols.c, doc/geany.txt, doc/geany.html, + tagmanager/makefile.win32, tagmanager/nestlevel.c, + tagmanager/nestlevel.h, tagmanager/python.c, tagmanager/rest.c, + tagmanager/Makefile.am, wscript: + Merge unstable branch: + Add reStructuredText scope information for tags (for symbol list + grouping). + Read custom system global tags files from $prefix/share/geany/tags; + Closes #2778923. + Show the number of tags in a user global tags file (instead of the + running total) in the debug message. + Also print debug messages when loading a tag file manually or for + default global tags files e.g. python.tags. + - code: + Move NestingLevel tags code into a separate file, add functions. + - docs: + Add 'Installation prefix' section instead of quoting '/usr/local' + each time. + Update for custom system global tags files. + + +2009-05-11 Enrico Tröger + + * src/highlighting.c: + Unset maybe previously keywords when setting up Scintilla for + XML files. This fixed wrong highlighting after switching back to + filetype XML from another one. + * src/utils.c: + Use plain old fwrite() in utils_write_file(). g_file_set_contents() + is only used when explicitly requested. + * src/dialogs.c: + Remove unnecessary call to g_intern_string() to fix build with + GLib 2.8 (closes #2790051). + + +2009-05-10 Enrico Tröger + + * src/ui_utils.c: + Make the clear icon of entry fields act on the release event, not + on the press event like for other buttons. + * src/editor.c: + Refactor some multiple used code into get_multiline_comment_style(). + * src/main.c: + Create parent directories if necessary when checking for the + configuration directory on startup (closes #2784577). + + +2009-05-08 Enrico Tröger + + * plugins/filebrowser.c: + When a filter is set, apply it only to files, not directories and + apply the filter to the UTF-8 name of the file as the filter string + itself is also UTF-8. + * src/utils.c, src/utils.h, src/highlighting.c, src/printing.c: + Add utils_color_invert() and use it in highlighting.c and printing.c. + * scintilla/include/Scintilla.h, scintilla/scintilla_changes.patch: + Backport change from Scintilla CVS: + Change capitalisation of header file to suit cross-compilation on + Unix for Windows. + + +2009-05-03 Enrico Tröger + + * wscript, scintilla/*, scintilla/include/*, src/plugindata.h: + Update Scintilla to version 1.78. + * src/editor.c, src/highlighting.c: + Update Pascal styles as they changed in Scintilla. + + 2009-05-02 Enrico Tröger * src/printing.c: Ignore the invert syntax highlighting colours setting when printing to not print characters on a dark background (closes #2785244). * New release: Geany 0.17 "Wessex". + * 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-04-30 Enrico Tröger diff -Nru /tmp/H5qKeNSrz8/geany-0.17/config.guess /tmp/ssBwSf4GIv/geany-0.18/config.guess --- geany-0.17/config.guess 2008-07-08 00:41:25.000000000 +0100 +++ geany-0.18/config.guess 2009-08-16 18:29:20.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 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -170,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -324,6 +324,9 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -331,7 +334,20 @@ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -640,7 +656,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -796,7 +812,7 @@ x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -806,6 +822,9 @@ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -866,40 +885,17 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -931,10 +927,13 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + 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 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -982,17 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1058,7 +1046,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1102,8 +1090,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1141,6 +1132,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1153,7 +1154,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1216,6 +1217,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1324,6 +1328,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/config.h.in /tmp/ssBwSf4GIv/geany-0.18/config.h.in --- geany-0.17/config.h.in 2009-05-02 18:50:12.000000000 +0100 +++ geany-0.18/config.h.in 2009-08-16 18:29:19.000000000 +0100 @@ -105,6 +105,10 @@ /* Define if you want VTE support */ #undef HAVE_VTE +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -120,6 +124,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -Nru /tmp/H5qKeNSrz8/geany-0.17/config.sub /tmp/ssBwSf4GIv/geany-0.18/config.sub --- geany-0.17/config.sub 2008-07-08 00:41:25.000000000 +0100 +++ geany-0.18/config.sub 2009-08-16 18:29:20.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 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,6 +122,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -152,6 +153,9 @@ os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -249,13 +253,16 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +275,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +285,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | 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 \ @@ -286,7 +294,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -329,14 +337,17 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +369,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | 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-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -439,6 +450,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -455,10 +470,18 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -526,6 +549,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1128,6 +1155,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1166,7 +1197,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1236,10 +1267,11 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1248,7 +1280,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1388,6 +1420,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1585,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/configure /tmp/ssBwSf4GIv/geany-0.18/configure --- geany-0.17/configure 2009-05-02 18:50:14.000000000 +0100 +++ geany-0.18/configure 2009-08-16 18:29:22.000000000 +0100 @@ -1,18 +1,20 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. +# Generated by GNU Autoconf 2.64. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 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. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -20,23 +22,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -44,7 +38,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -55,7 +55,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -78,13 +78,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -94,15 +87,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -114,12 +107,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -131,330 +128,299 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break fi - fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -fi -fi +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -471,8 +437,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -482,29 +447,18 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -534,7 +488,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -553,10 +507,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -571,26 +525,25 @@ - # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$ECHO in +case X$lt_ECHO in X*--fallback-echo) # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` ;; esac -echo=${ECHO-echo} +ECHO=${lt_ECHO-echo} if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. shift elif test "X$1" = X--fallback-echo; then # Avoid inline document here, it may be left over : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! : else # Restart under the correct shell. @@ -600,9 +553,9 @@ if test "X$1" = X--fallback-echo; then # used as fallback echo shift - cat </dev/null 2>&1 && unset CDPATH -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi fi fi fi fi -fi # Copy echo and quote the copy suitably for passing to libtool from # the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -tagnames=${tagnames+${tagnames},}CXX - -tagnames=${tagnames+${tagnames},}F77 - exec 7<&0 &1 # Name of the host. @@ -743,7 +691,6 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -751,6 +698,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="configure.in" # Factoring default headers for most tests. @@ -792,7 +740,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS GEANY_DATA_DIR -GEANY_PIXMAPS_DIR MKINSTALLDIRS POSUB POFILES @@ -816,16 +763,21 @@ GTK_LIBS GTK_CFLAGS PKG_CONFIG -LIBTOOL -ac_ct_F77 -FFLAGS -F77 CXXCPP +OTOOL64 +OTOOL +LIPO NMEDIT DSYMUTIL +lt_ECHO RANLIB AR -ECHO +OBJDUMP +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP SED host_os host_vendor @@ -835,6 +787,7 @@ build_vendor build_cpu build +LIBTOOL DATADIRNAME ALL_LINGUAS INTLTOOL_PERL @@ -944,6 +897,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -958,11 +912,10 @@ enable_nls enable_static enable_shared +with_pic enable_fast_install with_gnu_ld enable_libtool_lock -with_pic -with_tags enable_binreloc enable_deprecated enable_plugins @@ -985,8 +938,6 @@ CXXFLAGS CCC CXXCPP -F77 -FFLAGS PKG_CONFIG GTK_CFLAGS GTK_LIBS @@ -1100,8 +1051,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1127,8 +1077,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1332,8 +1281,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1349,8 +1297,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1380,17 +1327,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1407,15 +1354,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1438,8 +1383,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1469,11 +1413,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1512,13 +1454,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1642,10 +1582,9 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] include additional configurations [automatic] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-vte-module-path=PATH Path to a loadable libvte [default=None] @@ -1661,8 +1600,6 @@ CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags PKG_CONFIG path to pkg-config utility GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config @@ -1672,6 +1609,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1735,133 +1673,659 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.64 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +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_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - $ $0 $@ + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval -_ACEOF -exec 5>>config.log +} # ac_fn_c_try_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +} # ac_fn_c_try_cpp -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -_ASUNAME +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done -IFS=$as_save_IFS +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -} >&5 +} # ac_fn_c_check_header_mongrel -cat >&5 <<_ACEOF +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { 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; } && { ac_try='./conftest$ac_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 : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=$ac_status +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 -## ----------- ## -## Core tests. ## -## ----------- ## +} # ac_fn_c_try_run +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> _ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +} # ac_fn_c_check_header_compile -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +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_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## +} # ac_fn_cxx_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { 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>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # 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 + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func + +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_cxx_try_cpp + +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { 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>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # 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 + +} # ac_fn_cxx_try_link + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +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 + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## ## ---------------- ## _ASBOX echo @@ -1872,13 +2336,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1950,39 +2414,41 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. @@ -2001,7 +2467,7 @@ do test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + { $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 . "$ac_site_file" @@ -2012,7 +2478,7 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + { $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 [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -2020,7 +2486,7 @@ esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2035,11 +2501,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -2049,17 +2515,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -2071,65 +2537,42 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -am__api_version='1.10' +am__api_version='1.10' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2155,10 +2598,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2166,11 +2609,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2207,7 +2650,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -2223,7 +2666,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2234,7 +2677,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 @@ -2258,11 +2701,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2271,13 +2711,10 @@ # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2298,14 +2735,14 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $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 - if test "${ac_cv_path_mkdir+set}" = set; then + if test "${ac_cv_path_mkdir+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2313,7 +2750,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2325,7 +2762,7 @@ esac done done -done + done IFS=$as_save_IFS fi @@ -2341,7 +2778,7 @@ MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2354,9 +2791,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_AWK+set}" = set; then +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2367,24 +2804,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2392,11 +2829,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2414,11 +2851,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2438,9 +2875,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2456,7 +2891,7 @@ # Define the identity of the package. PACKAGE=geany - VERSION=0.17 + VERSION=0.18 cat >>confdefs.h <<_ACEOF @@ -2494,9 +2929,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $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 +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2507,24 +2942,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 $as_echo "$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2534,9 +2969,9 @@ 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:$LINENO: checking for $ac_word" >&5 +{ $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 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2547,24 +2982,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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:$LINENO: result: $ac_ct_STRIP" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 $as_echo "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2573,7 +3008,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -2614,7 +3049,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= @@ -2642,12 +3077,12 @@ fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -2672,9 +3107,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2685,24 +3120,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2712,9 +3147,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2725,24 +3160,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2751,7 +3186,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -2765,9 +3200,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2778,24 +3213,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2805,9 +3240,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2819,18 +3254,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2849,10 +3284,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2864,9 +3299,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2877,24 +3312,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2908,9 +3343,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2921,24 +3356,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2951,7 +3386,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -2962,73 +3397,55 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +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" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.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:$LINENO: checking for C compiler default output file name" >&5 +{ $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; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` @@ -3045,17 +3462,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3072,7 +3489,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3091,84 +3508,75 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 $as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then +if test -z "$ac_file"; then : $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } fi - 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:$LINENO: checking whether the C compiler works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 $as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # 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 + { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $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:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $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 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.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:$LINENO: checking whether we are cross compiling" >&5 +{ $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:$LINENO: result: $cross_compiling" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 $as_echo "$cross_compiling" >&6; } -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $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" +if { { 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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3183,32 +3591,24 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +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 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +{ $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 -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +{ $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 +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3220,17 +3620,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3243,31 +3643,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3281,37 +3673,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3320,20 +3691,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3344,35 +3711,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3383,36 +3726,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3423,42 +3742,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3475,18 +3769,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3543,32 +3833,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3579,17 +3846,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3599,9 +3868,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3690,7 +3959,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3711,14 +3980,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -3733,11 +4002,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3746,78 +4011,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -3829,7 +4050,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -3840,11 +4061,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -3853,87 +4070,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -3943,9 +4113,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3956,7 +4126,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -3976,7 +4146,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -3991,26 +4161,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4024,7 +4192,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -4044,7 +4212,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -4059,12 +4227,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4072,21 +4238,17 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4101,48 +4263,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4152,18 +4289,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -4173,14 +4306,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4207,118 +4336,34 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4329,134 +4374,8 @@ - if test "${ac_cv_header_minix_config_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5 -$as_echo_n "checking minix/config.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5 -$as_echo_n "checking minix/config.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_minix_config_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } - -fi -if test "x$ac_cv_header_minix_config_h" = x""yes; then + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +if test "x$ac_cv_header_minix_config_h" = x""yes; then : MINIX=yes else MINIX= @@ -4465,34 +4384,23 @@ if test "$MINIX" = yes; then -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 -_ACEOF +$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define _POSIX_1_SOURCE 2 -_ACEOF +$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h -cat >>confdefs.h <<\_ACEOF -#define _MINIX 1 -_ACEOF +$as_echo "#define _MINIX 1" >>confdefs.h fi - - { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then +if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # define __EXTENSIONS__ 1 @@ -4505,528 +4413,234 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_safe_to_define___extensions__=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_safe_to_define___extensions__=no + ac_cv_safe_to_define___extensions__=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } test $ac_cv_safe_to_define___extensions__ = yes && - cat >>confdefs.h <<\_ACEOF -#define __EXTENSIONS__ 1 -_ACEOF + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 -_ACEOF + $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF + $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _POSIX_PTHREAD_SEMANTICS 1 -_ACEOF + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - cat >>confdefs.h <<\_ACEOF -#define _TANDEM_SOURCE 1 -_ACEOF + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h - if test "${ac_cv_header_minix_config_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5 -$as_echo_n "checking minix/config.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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_CC="${ac_tool_prefix}gcc" + $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 - ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5 -$as_echo_n "checking minix/config.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; 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_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_cv_header_minix_config_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" + $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 -if test "x$ac_cv_header_minix_config_h" = x""yes; then - MINIX=yes +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - MINIX= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - if test "$MINIX" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_1_SOURCE 2 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _MINIX 1 -_ACEOF - + if test "x$ac_ct_CC" = x; then + CC="" + 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 + CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" +fi - - - { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_safe_to_define___extensions__=yes + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_safe_to_define___extensions__=no -fi +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_CC="${ac_tool_prefix}cc" + $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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - cat >>confdefs.h <<\_ACEOF -#define __EXTENSIONS__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _POSIX_PTHREAD_SEMANTICS 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _TANDEM_SOURCE 1 -_ACEOF - - - - if test "${ac_cv_header_minix_config_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then - $as_echo_n "(cached) " >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5 -$as_echo_n "checking minix/config.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5 -$as_echo_n "checking minix/config.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + fi fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } -if test "${ac_cv_header_minix_config_h+set}" = set; then +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; 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_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_cv_header_minix_config_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 -$as_echo "$ac_cv_header_minix_config_h" >&6; } - -fi -if test "x$ac_cv_header_minix_config_h" = x""yes; then - MINIX=yes + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else - MINIX= -fi - - - if test "$MINIX" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _POSIX_1_SOURCE 2 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define _MINIX 1 -_ACEOF - + ac_prog_rejected=no +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 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $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 - - - { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_safe_to_define___extensions__=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_safe_to_define___extensions__=no +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - cat >>confdefs.h <<\_ACEOF -#define __EXTENSIONS__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _ALL_SOURCE 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _POSIX_PTHREAD_SEMANTICS 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define _TANDEM_SOURCE 1 -_ACEOF - +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; 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_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5037,36 +4651,40 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + test -n "$CC" && break + done fi -if test -z "$ac_cv_prog_CC"; then +if test -z "$CC"; then ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; 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_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -5077,233 +4695,37 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + + test -n "$ac_ct_CC" && break +done + if test "x$ac_ct_CC" = x; then CC="" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$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 - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -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 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -5314,62 +4736,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5383,37 +4785,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -5422,20 +4803,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5446,35 +4823,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5485,36 +4838,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5525,42 +4854,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -5577,18 +4881,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -5645,32 +4945,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -5681,17 +4958,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5701,9 +4980,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -5792,7 +5071,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -5822,9 +5101,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_CXX+set}" = set; then +if test "${ac_cv_prog_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -5835,24 +5114,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 $as_echo "$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5866,9 +5145,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $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_CXX+set}" = set; then +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -5879,24 +5158,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 $as_echo "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5909,7 +5188,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 @@ -5920,53 +5199,36 @@ fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5980,37 +5242,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes @@ -6019,20 +5260,16 @@ fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then +if test "${ac_cv_prog_cxx_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6043,35 +5280,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6082,36 +5295,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cxx_werror_flag=$ac_save_cxx_werror_flag +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6122,42 +5311,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 $as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS @@ -6182,9 +5346,9 @@ depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -6273,7 +5437,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -6292,127 +5456,33 @@ # after AC_PROG_CXX has set the CXX environment variable which $CXX >/dev/null 2>&1 if test "x$?" != "x0"; then - { { $as_echo "$as_me:$LINENO: error: No C++ compiler not found. Please install a C++ compiler." >&5 -$as_echo "$as_me: error: No C++ compiler not found. Please install a C++ compiler." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "No C++ compiler not found. Please install a C++ compiler." "$LINENO" 5 fi #AC_PROG_RANLIB -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - -done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL 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. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 $as_echo "no, using $LN_S" >&6; } fi - { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then +if test "${enable_nls+set}" = set; then : enableval=$enable_nls; USE_NLS=$enableval else USE_NLS=yes fi - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 $as_echo "$USE_NLS" >&6; } @@ -6420,35 +5490,31 @@ case "$am__api_version" in 1.01234) - { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 -$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; esac if test -n ""; then - { $as_echo "$as_me:$LINENO: checking for intltool >= " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 $as_echo_n "checking for intltool >= ... " >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5 -$as_echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Your intltool is too old. You need intltool or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -6461,14 +5527,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6476,19 +5542,19 @@ fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 $as_echo "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -6501,14 +5567,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6516,19 +5582,19 @@ fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 $as_echo "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -6541,14 +5607,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6556,18 +5622,16 @@ fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 $as_echo "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 -$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -6689,9 +5753,9 @@ # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -6704,14 +5768,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6719,19 +5783,19 @@ fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then +if test "${ac_cv_path_MSGMERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -6744,14 +5808,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6759,19 +5823,19 @@ fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 $as_echo "$MSGMERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -6784,14 +5848,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6799,19 +5863,19 @@ fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_path_GMSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -6824,14 +5888,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -6840,33 +5904,29 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -6879,14 +5939,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + 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_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6894,41 +5954,35 @@ fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 $as_echo "$INTLTOOL_PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then - { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 -$as_echo "$as_me: error: perl not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "perl not found" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5 -$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then - { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 $as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -6938,11 +5992,7 @@ # Set DATADIRNAME correctly if it is not set yet # (copied from glib-gettext.m4) if test -z "$DATADIRNAME"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -6954,120 +6004,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : DATADIRNAME=share else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -7079,10 +6022,8 @@ ;; esac fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi @@ -7092,7 +6033,7 @@ # for plugins # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then +if test "${enable_static+set}" = set; then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -7116,85 +6057,60 @@ -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi -# Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi + + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.2.6' +macro_revision='1.3012' + + + + + + + + + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then +if test "${ac_cv_build+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -7210,28 +6126,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then +if test "${ac_cv_host+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -7247,68 +6159,177 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${lt_cv_path_SED+set}" = set; then +if test "${ac_cv_path_SED+set}" = set; then : $as_echo_n "(cached) " >&6 else - # Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do + for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 done done -done + done IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break + if test -z "$ac_cv_path_SED"; then + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done -done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_FGREP=$FGREP +fi + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + -SED=$lt_cv_path_SED -{ $as_echo "$as_me:$LINENO: result: $SED" >&5 -$as_echo "$SED" >&6; } # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -7317,7 +6338,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) @@ -7331,9 +6352,9 @@ [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -7347,13 +6368,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then +if test "${lt_cv_path_LD+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -7384,18 +6405,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 $as_echo "$LD" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then +if test "${lt_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -7408,39 +6427,21 @@ ;; esac fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -$as_echo_n "checking for BSD-compatible nm... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test "${lt_cv_path_NM+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -7484,1225 +6485,1058 @@ done IFS="$lt_save_ifs" done - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm + : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -NM="$lt_cv_path_NM" - -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$ac_tool_prefix"; then + for ac_prog in "dumpbin -symbols" "link -dump -symbols" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; 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_DUMPBIN+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_DUMPBIN="$ac_tool_prefix$ac_prog" + $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 -beos*) - lt_cv_deplibs_check_method=pass_all - ;; +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in "dumpbin -symbols" "link -dump -symbols" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; 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_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_DUMPBIN="$ac_prog" + $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 -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_DUMPBIN" && break +done + + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + 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 + DUMPBIN=$ac_ct_DUMPBIN fi - ;; +fi -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" fi - ;; +fi +test -z "$NM" && NM=nm -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:6616: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:6619: $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) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; - ncr) - lt_cv_deplibs_check_method=pass_all + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 ;; - siemens) - lt_cv_deplibs_check_method=pass_all + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi ;; - pc) - lt_cv_deplibs_check_method=pass_all + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac - ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac +fi +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown +max_cmd_len=$lt_cv_sys_max_cmd_len -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 7729 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' ;; +esac + -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - lt_cv_cc_needs_belf=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - lt_cv_cc_needs_belf=no -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac -esac -need_locks="$enable_libtool_lock" -for ac_header in dlfcn.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+set}" = set; then : $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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_OBJDUMP="${ac_tool_prefix}objdump" + $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 - ac_header_compiler=no +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; 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_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump" + $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 - ac_header_preproc=no +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + 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 + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +test -z "$OBJDUMP" && OBJDUMP=objdump - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if test "${lt_cv_deplibs_check_method+set}" = set; then : $as_echo_n "(cached) " >&6 else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. - # Broken: fails on valid input. -continue -fi +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; -rm -f conftest.err conftest.$ac_ext +beos*) + lt_cv_deplibs_check_method=pass_all + ;; - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; - # Passes both tests. -ac_preproc_ok=: -break -fi +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; -rm -f conftest.err conftest.$ac_ext +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; - done - ac_cv_prog_CXXCPP=$CXXCPP +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; - # Broken: fails on valid input. -continue -fi +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; -rm -f conftest.err conftest.$ac_ext +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; - # Passes both tests. -ac_preproc_ok=: -break -fi +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; -rm -f conftest.err conftest.$ac_ext +# This must be Linux ELF. +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -fi +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; -fi +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; 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_F77+set}" = set; then +if test "${ac_cv_prog_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # 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 + 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_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_AR="${ac_tool_prefix}ar" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - { $as_echo "$as_me:$LINENO: result: $F77" >&5 -$as_echo "$F77" >&6; } +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$F77" && break - done fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; 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_F77+set}" = set; then +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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 + 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_F77="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_AR="ar" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - test -n "$ac_ct_F77" && break -done - - if test "x$ac_ct_F77" = x; then - F77="" + if test "x$ac_ct_AR" = x; then + AR="false" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 - F77=$ac_ct_F77 + AR=$ac_ct_AR fi +else + AR="$ac_cv_prog_AR" fi +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru -# Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if test "${ac_cv_f77_compiler_gnu+set}" = set; 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 - cat >conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif - - end -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - ac_compiler_gnu=no +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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } -if test "${ac_cv_prog_f77_g+set}" = set; then +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 - FFLAGS=-g -cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +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 - ac_cv_prog_f77_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - 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 - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test $ac_compiler_gnu = yes; then - G77=yes + 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 - G77= + STRIP="$ac_cv_prog_STRIP" fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +test -z "$STRIP" && STRIP=: -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -# find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - $as_echo_n "(cached) " >&6 -else - i=0 - teststring="ABCD" - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib" + $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 - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; 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_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib" + $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_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + 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 + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +test -z "$RANLIB" && RANLIB=: + + + + + + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -else - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } -fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -8715,33 +7549,18 @@ # Regexp to match symbols that can be accessed directly from C. sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -# Transform an extracted symbol line into a proper C declaration -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - # Define system-specific variables. case $host_os in aix*) symcode='[BCDT]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; -hpux*) # Its linker distinguishes data from code symbols +hpux*) if test "$host_cpu" = ia64; then symcode='[ABCDEGRST]' fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -linux* | k*bsd*-gnu) - if test "$host_cpu" = ia64; then - symcode='[ABCDGIRSTW]' - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - fi ;; irix* | nonstopux*) symcode='[BCDEGRST]' @@ -8766,57 +7585,85 @@ ;; esac +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + # Handle CRLF in mingw tool chain opt_cr= case $build_os in mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ;; esac -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Try without a prefix undercore, then with it. +# Try without a prefix underscore, then with it. for ac_symprfx in "" "_"; do # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. symxfrm="\\1 $ac_symprfx\\2 \\2" # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi # Check to see that the pipe works correctly. pipe_works=no rm -f conftest* - cat > conftest.$ac_ext < conftest.$ac_ext <<_LT_EOF #ifdef __cplusplus extern "C" { #endif char nm_test_var; -void nm_test_func(){} +void nm_test_func(void); +void nm_test_func(void){} #ifdef __cplusplus } #endif int main(){nm_test_var='a';nm_test_func();return(0);} -EOF +_LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -8825,53 +7672,55 @@ fi # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext #ifdef __cplusplus extern "C" { #endif -EOF +_LT_EOF # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif + cat <<_LT_EOF >> conftest.$ac_ext -/* The mapping between symbol names and symbols. */ +/* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + void *address; } -lt_preloaded_symbols[] = +lt__PROGRAM__LTX_preloaded_symbols[] = { -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} }; +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + #ifdef __cplusplus } #endif -EOF +_LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext lt_save_LIBS="$LIBS" lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" @@ -8905,763 +7754,755 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 $as_echo "failed" >&6; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then - $as_echo_n "(cached) " >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES + + + + + + + + + + + + + + + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line 7816 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* ;; -esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; -# Same as above, but do not quote variable references. -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' +int +main () +{ -# Constants: -rm="rm -f" + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +else + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Global variables: -default_ofile=libtool -can_build_shared=yes +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" +need_locks="$enable_libtool_lock" -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; 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_AR+set}" = set; then +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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 + 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_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 -$as_echo "$AR" >&6; } +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; 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_AR+set}" = set; then +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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 + 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_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_AR" = x; then - AR="false" + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 - AR=$ac_ct_AR + DSYMUTIL=$ac_ct_DSYMUTIL fi else - AR="$ac_cv_prog_AR" + DSYMUTIL="$ac_cv_prog_DSYMUTIL" fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; 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_RANLIB+set}" = set; then +if test "${ac_cv_prog_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # 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 + 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_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; 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_RANLIB+set}" = set; then +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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 + 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_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 - RANLIB=$ac_ct_RANLIB + NMEDIT=$ac_ct_NMEDIT fi else - RANLIB="$ac_cv_prog_RANLIB" + NMEDIT="$ac_cv_prog_NMEDIT" fi -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:$LINENO: checking for $ac_word" >&5 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; 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 +if test "${ac_cv_prog_LIPO+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. + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # 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 + 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $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:$LINENO: checking for $ac_word" >&5 +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; 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 +if test "${ac_cv_prog_ac_ct_LIPO+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. + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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 + 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -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:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_STRIP" = x; then - STRIP=":" + if test "x$ac_ct_LIPO" = x; then + LIPO=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 + LIPO=$ac_ct_LIPO fi else - STRIP="$ac_cv_prog_STRIP" -fi - - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - else - MAGIC_CMD=: - fi + LIPO="$ac_cv_prog_LIPO" fi - fi - ;; -esac - - - case $host_os in - rhapsody* | darwin*) if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; 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_DSYMUTIL+set}" = set; then +if test "${ac_cv_prog_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # 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 + 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_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; 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_DSYMUTIL+set}" = set; then +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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 + 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_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 - DSYMUTIL=$ac_ct_DSYMUTIL + OTOOL=$ac_ct_OTOOL fi else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" + OTOOL="$ac_cv_prog_OTOOL" fi if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; 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_NMEDIT+set}" = set; then +if test "${ac_cv_prog_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # 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 + 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_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; 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_NMEDIT+set}" = set; then +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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 + 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_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $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 - NMEDIT=$ac_ct_NMEDIT + OTOOL64=$ac_ct_OTOOL64 fi else - NMEDIT="$ac_cv_prog_NMEDIT" + OTOOL64="$ac_cv_prog_OTOOL64" fi - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - echo "int foo(void){return 1;}" > conftest.c - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib ${wl}-single_module conftest.c - if test -f libconftest.dylib; then - lt_cv_apple_cc_single_mod=yes - rm -rf libconftest.dylib* - fi - rm conftest.c + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* fi fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9672,59 +8513,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in - rhapsody* | darwin1.[0123]) + rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -9734,8322 +8550,2846 @@ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' else - _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi if test "$DSYMUTIL" != ":"; then - _lt_dsymutil="~$DSYMUTIL \$lib || :" + _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= fi ;; esac +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF -enable_dlopen=no -enable_win32_dll=no - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +done -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then - withval=$with_pic; pic_mode="$withval" + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; 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_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 else - pic_mode=default -fi + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # 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_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -test -z "$pic_mode" && pic_mode=default +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Use C for the default configuration in the libtool script -tagname= -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; 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_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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_CXX="$ac_prog" + $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 -# Source file extension for C test sources. -ac_ext=c +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Object file extension for compiled C test sources. -objext=o -objext=$objext -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" + test -n "$ac_ct_CXX" && break +done -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' + if test "x$ac_ct_CXX" = x; then + CXX="g++" + 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 + CXX=$ac_ct_CXX + fi +fi + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +int +main () +{ +#ifndef __GNUC__ + choke me +#endif -# Allow CC to be a program name with arguments. -compiler=$CC + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +int +main () +{ -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : -lt_prog_compiler_no_builtin_flag= +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9841: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:9845: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $rm conftest* + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + 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 + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + 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} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} 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 && + ${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 + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir else - : + am_cv_CXX_dependencies_compiler_type=none fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; + done + ac_cv_prog_CXXCPP=$CXXCPP - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic='-qnocommon' - lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +_lt_caught_CXX_error=yes; } +fi - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; +else + _lt_caught_CXX_error=yes +fi - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; +# Set options - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; + enable_dlopen=no - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; + enable_win32_dll=no - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; *) - lt_prog_compiler_can_build_shared=no + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" ;; esac - fi +else + enable_shared=yes +fi -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - $as_echo_n "(cached) " >&6 + + + + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10131: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:10135: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $rm conftest* - + pic_mode=default fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac +test -z "$pic_mode" && pic_mode=default -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : + + + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - lt_prog_compiler_static= + enable_fast_install=yes fi -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10235: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:10239: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - runpath_var= - allow_undefined_flag= - enable_shared_with_static_runtimes=no - archive_cmds= - archive_expsym_cmds= - old_archive_From_new_cmds= - old_archive_from_expsyms_cmds= - export_dynamic_flag_spec= - whole_archive_flag_spec= - thread_safe_flag_spec= - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_direct=no - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - link_all_deplibs=unknown - hardcode_automatic=no - module_cmds= - module_expsym_cmds= - always_export_symbols=no - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <&2 +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. -EOF - fi - ;; - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - 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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - archive_cmds='' - hardcode_direct=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes +test -z "$LN_S" && LN_S="ln -s" - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - whole_archive_flag_spec='' - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld='+b $libdir' - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld='-rpath $libdir' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - solaris*) - no_undefined_flag=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; +# Global variables: +ofile=libtool +can_build_shared=yes - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; +with_gnu_ld="$lt_cv_prog_gnu_ld" - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; +old_CC="$CC" +old_CFLAGS="$CFLAGS" - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac fi - ;; + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - *) - ld_shlibs=no - ;; - esac - fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } - ;; - esac - fi +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; -esac +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else - lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" +_LT_EOF + fi ;; + esac + fi + break fi done - lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - sys_lib_search_path_spec=`echo $lt_search_path_spec` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac fi -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH + MAGIC_CMD=: fi - ;; +fi -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + fi ;; +esac -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; +# Use C for the default configuration in the libtool script -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes +# Source file extension for C test sources. +ac_ext=c - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; +# Object file extension for compiled C test sources. +objext=o +objext=$objext - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -freebsd1*) - dynamic_linker=no - ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; +# Allow CC to be a program name with arguments. +compiler=$CC -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; +if test -n "$compiler"; then -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +lt_prog_compiler_no_builtin_flag= -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:9552: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:9556: \$? = $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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi -rdos*) - dynamic_linker=no - ;; +fi -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes + + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ - test "X$hardcode_automatic" = "Xyes" ; then + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; -striplib= -old_striplib= -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - ;; - *) - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; + linux* | k*bsd*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + esac + ;; + esac + ;; - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dl_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; - ac_cv_lib_dl_dlopen=no -fi + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else + rdos*) + lt_prog_compiler_static='-non_shared' + ;; - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; -fi + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; - ;; + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; - *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -#ifdef __STDC__ -# include -#else -# include -#endif + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; -#undef shl_load + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } - ac_cv_func_shl_load=no -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then - lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then + + + + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:9891: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:9895: \$? = $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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dld_shl_load=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - ac_cv_lib_dld_shl_load=no +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif -#undef dlopen -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" - ac_cv_func_dlopen=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + lt_prog_compiler_static= +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dl_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dl_dlopen=no -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_svld_dlopen=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:9996: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:10000: \$? = $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 + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* - ac_cv_lib_svld_dlopen=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dld_dld_link=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dld_dld_link=no -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:10051: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:10055: \$? = $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 + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -fi +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no fi -fi - ;; - esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif + ld_shlibs=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -#include + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. -#ifdef __cplusplus -extern "C" void exit (int); -#endif +_LT_EOF + fi + ;; -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + 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' + ;; - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag= + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -#if HAVE_DLFCN_H -#include -#endif + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi -#include + case $cc_basename in + xlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 -#ifdef __cplusplus -extern "C" void exit (int); -#endif +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - else - puts (dlerror ()); + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 - exit (status); -} -EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - -# Report which library types will actually be built -{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - -{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler \ - CC \ - LD \ - lt_prog_compiler_wl \ - lt_prog_compiler_pic \ - lt_prog_compiler_static \ - lt_prog_compiler_no_builtin_flag \ - export_dynamic_flag_spec \ - thread_safe_flag_spec \ - whole_archive_flag_spec \ - enable_shared_with_static_runtimes \ - old_archive_cmds \ - old_archive_from_new_cmds \ - predep_objects \ - postdep_objects \ - predeps \ - postdeps \ - compiler_lib_search_path \ - compiler_lib_search_dirs \ - archive_cmds \ - archive_expsym_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - old_archive_from_expsyms_cmds \ - allow_undefined_flag \ - no_undefined_flag \ - export_symbols_cmds \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ - hardcode_automatic \ - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ - fix_srcfile_path \ - exclude_expsyms \ - include_expsyms; do - - case $var in - old_archive_cmds | \ - old_archive_from_new_cmds | \ - archive_cmds | \ - archive_expsym_cmds | \ - module_cmds | \ - module_expsym_cmds | \ - old_archive_from_expsyms_cmds | \ - export_symbols_cmds | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no ;; + *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi ;; esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac -cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - { $as_echo "$as_me:$LINENO: creating $ofile" >&5 -$as_echo "$as_me: creating $ofile" >&6;} + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; - cat <<__EOF__ >> "$cfgfile" -#! $SHELL + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# 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. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac -# A sed program that does not truncate output. -SED=$lt_SED + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e 1s/^X//" + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' -# The names of the tagged configurations supported by this script. -available_tags= + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -# ### BEGIN LIBTOOL CONFIG + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +int +main () +{ -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -# Whether or not to build static libraries. -build_old_libs=$enable_static + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc +int +main () +{ -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; -# A C compiler. -LTCC=$lt_LTCC + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; -# A language-specific compiler. -CC=$lt_compiler + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; -# Is the compiler the GNU C compiler? -with_gcc=$GCC + darwin* | rhapsody*) -# An ERE matcher. -EGREP=$lt_EGREP -# The linker used to build libraries. -LD=$lt_LD + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='' + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -# Whether we need hard or soft links. -LN_S=$lt_LN_S + else + ld_shlibs=no + fi -# A BSD-compatible nm program. -NM=$lt_NM + ;; -# A symbol stripping program -STRIP=$lt_STRIP + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD + freebsd1*) + ld_shlibs=no + ;; -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; -# Used on cygwin: assembler. -AS="$AS" + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -# The name of the directory that contains temporary libtool files. -objdir=$objdir + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; -# Object file suffix (normally "o"). -objext="$ac_objext" + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: -# Old archive suffix (normally "a"). -libext="$libext" + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; -# Executable file suffix (normally ""). -exeext="$exeext" + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo(void) {} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic -pic_mode=$pic_mode +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; -# Must we lock files when doing compilation? -need_locks=$lt_need_locks + *nto* | *qnx*) + ;; -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; -# Do we need a version for libraries? -need_version=$need_version + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag + *) + ld_shlibs=no + ;; + esac -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi + fi -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval +with_gnu_ld=$with_gnu_ld -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -# This is the shared library runtime path variable. -runpath_var=$runpath_var -# This is the shared library path variable. -shlibpath_var=$shlibpath_var -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + archive_cmds_need_lc=no + else + archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; +esac -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms -# ### END LIBTOOL CONFIG -__EOF__ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" -# Check whether --with-tags was given. -if test "${with_tags+set}" = set; then - withval=$with_tags; tagnames="$withval" -fi -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} - fi - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} - else - { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} - fi - fi - if test -z "$LTCFLAGS"; then - eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" - fi - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in - "") ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} - { (exit 1); exit 1; }; } - fi - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no -# Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= -compiler_lib_search_dirs_CXX= -# Source file extension for C++ test sources. -ac_ext=cpp -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" -# Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }' -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - $as_unset lt_cv_prog_gnu_ld -fi -if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX -else - $as_unset lt_cv_path_LD -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -compiler_CXX=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -else - lt_prog_compiler_no_builtin_flag_CXX= -fi -if test "$GXX" = yes; then - # Set up default GNU C++ configuration -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -else - GXX=no - with_gnu_ld=no - wlarc= -fi -# PORTME: fill in a description of your system's C++ link characteristics -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -ld_shlibs_CXX=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - if test "$GXX" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_CXX=no - ;; - esac - fi - ;; - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - ld_shlibs_CXX=no - ;; - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - gnu*) - ;; - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - case $host_cpu in - hppa*64*|ia64*) ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc*) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd='echo' - else - ld_shlibs_CXX=no - fi - ;; - osf3*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - output_verbose_link_cmd='echo' - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - # So that behaviour is only enabled if SCOABSPATH is set to a - # non-empty value in the environment. Most likely only useful for - # creating official distributions of packages. - # This is a hack until libtool officially supports absolute path - # names for shared libraries. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no -GCC_CXX="$GXX" -LD_CXX="$LD" -cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. - output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - for p in `eval $output_verbose_link_cmd`; do - case $p in - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" \ - || test $p = "-R"; then - prev=$p - continue - else - prev= - fi - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - *) ;; # Ignore the rest. - esac - done - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi -$rm -f confest.$objext -compiler_lib_search_dirs_CXX= -if test -n "$compiler_lib_search_path_CXX"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac -lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_CXX='-qnocommon' - lt_prog_compiler_wl_CXX='-Wl,' - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - icpc* | ecpc*) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15157: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:15161: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $rm conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15261: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:15265: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; - linux* | k*bsd*-gnu) - link_all_deplibs_CXX=no - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; -esac - -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi - -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_CXX \ - CC_CXX \ - LD_CXX \ - lt_prog_compiler_wl_CXX \ - lt_prog_compiler_pic_CXX \ - lt_prog_compiler_static_CXX \ - lt_prog_compiler_no_builtin_flag_CXX \ - export_dynamic_flag_spec_CXX \ - thread_safe_flag_spec_CXX \ - whole_archive_flag_spec_CXX \ - enable_shared_with_static_runtimes_CXX \ - old_archive_cmds_CXX \ - old_archive_from_new_cmds_CXX \ - predep_objects_CXX \ - postdep_objects_CXX \ - predeps_CXX \ - postdeps_CXX \ - compiler_lib_search_path_CXX \ - compiler_lib_search_dirs_CXX \ - archive_cmds_CXX \ - archive_expsym_cmds_CXX \ - postinstall_cmds_CXX \ - postuninstall_cmds_CXX \ - old_archive_from_expsyms_cmds_CXX \ - allow_undefined_flag_CXX \ - no_undefined_flag_CXX \ - export_symbols_cmds_CXX \ - hardcode_libdir_flag_spec_CXX \ - hardcode_libdir_flag_spec_ld_CXX \ - hardcode_libdir_separator_CXX \ - hardcode_automatic_CXX \ - module_cmds_CXX \ - module_expsym_cmds_CXX \ - lt_cv_prog_compiler_c_o_CXX \ - fix_srcfile_path_CXX \ - exclude_expsyms_CXX \ - include_expsyms_CXX; do - - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS - -# A language-specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_CXX -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_CXX - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_CXX - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld - - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu - - -archive_cmds_need_lc_F77=no -allow_undefined_flag_F77= -always_export_symbols_F77=no -archive_expsym_cmds_F77= -export_dynamic_flag_spec_F77= -hardcode_direct_F77=no -hardcode_libdir_flag_spec_F77= -hardcode_libdir_flag_spec_ld_F77= -hardcode_libdir_separator_F77= -hardcode_minus_L_F77=no -hardcode_automatic_F77=no -module_cmds_F77= -module_expsym_cmds_F77= -link_all_deplibs_F77=unknown -old_archive_cmds_F77=$old_archive_cmds -no_undefined_flag_F77= -whole_archive_flag_spec_F77= -enable_shared_with_static_runtimes_F77=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -objext_F77=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="\ - subroutine t - return - end -" - -# Code to be used in simple link tests -lt_simple_link_test_code="\ - program t - end -" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${F77-"f77"} -compiler=$CC -compiler_F77=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - -{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case $host_os in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; -esac -{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - -{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } - -GCC_F77="$G77" -LD_F77="$LD" - -lt_prog_compiler_wl_F77= -lt_prog_compiler_pic_F77= -lt_prog_compiler_static_F77= - -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_static_F77='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_F77='-fno-common' - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared_F77=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_F77=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_F77='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - else - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_F77='-qnocommon' - lt_prog_compiler_wl_F77='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_F77='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_F77='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-fpic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl_F77='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - lt_prog_compiler_wl_F77='' - ;; - esac - ;; - esac - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_F77='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static_F77='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_F77='-Qoption ld ';; - *) - lt_prog_compiler_wl_F77='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl_F77='-Qoption ld ' - lt_prog_compiler_pic_F77='-PIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_F77='-Kconform_pic' - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_can_build_shared_F77=no - ;; - - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared_F77=no - ;; - esac - fi - -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -$as_echo "$lt_prog_compiler_pic_F77" >&6; } - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_F77"; then - -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16859: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:16863: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_F77=yes - fi - fi - $rm conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; - esac -else - lt_prog_compiler_pic_F77= - lt_prog_compiler_can_build_shared_F77=no -fi - -fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= - ;; - *) - lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" - ;; -esac - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_F77=yes - fi - else - lt_cv_prog_compiler_static_works_F77=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : -else - lt_prog_compiler_static_F77= -fi - - -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_F77=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16963: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:16967: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_F77=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag_F77= - enable_shared_with_static_runtimes_F77=no - archive_cmds_F77= - archive_expsym_cmds_F77= - old_archive_From_new_cmds_F77= - old_archive_from_expsyms_cmds_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - thread_safe_flag_spec_F77= - hardcode_libdir_flag_spec_F77= - hardcode_libdir_flag_spec_ld_F77= - hardcode_libdir_separator_F77= - hardcode_direct_F77=no - hardcode_minus_L_F77=no - hardcode_shlibpath_var_F77=unsupported - link_all_deplibs_F77=unknown - hardcode_automatic_F77=no - module_cmds_F77= - module_expsym_cmds_F77= - always_export_symbols_F77=no - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_F77= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs_F77=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_F77='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_F77=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_F77='-L$libdir' - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_F77=no - fi - ;; - - interix[3-9]*) - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_F77='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* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; - esac - archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_F77=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_F77=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - - if test "$ld_shlibs_F77" = no; then - runpath_var= - hardcode_libdir_flag_spec_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=yes - archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_F77=unsupported - fi - ;; - - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_F77='' - hardcode_direct_F77=yes - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_F77=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_F77=yes - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_libdir_separator_F77= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_F77=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_F77='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_F77="-z nodefs" - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_F77=' ${wl}-bernotok' - allow_undefined_flag_F77=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77='$convenience' - archive_cmds_need_lc_F77=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_F77=no - ;; - - bsdi[45]*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_F77=' ' - allow_undefined_flag_F77=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; - - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_F77=no - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='' - link_all_deplibs_F77=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_F77=no - ;; - esac - fi - ;; - - dgux*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - freebsd1*) - ld_shlibs_F77=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_F77='+b $libdir' - hardcode_direct_F77=no - hardcode_shlibpath_var_F77=no - ;; - *) - hardcode_direct_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - link_all_deplibs_F77=yes - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - newsos6) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_shlibpath_var_F77=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs_F77=no - fi - ;; - os2*) - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - allow_undefined_flag_F77=unsupported - archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - ;; - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_F77='-rpath $libdir' - fi - hardcode_libdir_separator_F77=: - ;; - solaris*) - no_undefined_flag_F77=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_shlibpath_var_F77=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs_F77=yes - ;; - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - sysv4) - case $host_vendor in - sni) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_F77='$CC -r -o $output$reload_objs' - hardcode_direct_F77=no - ;; - motorola) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no - ;; - sysv4.3*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='-Bexport' - ;; - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_F77=yes - fi - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_F77='${wl}-z,text' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_F77='${wl}-z,text' - allow_undefined_flag_F77='${wl}-z,nodefs' - archive_cmds_need_lc_F77=no - hardcode_shlibpath_var_F77=no - hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - export_dynamic_flag_spec_F77='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - uts4*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - *) - ld_shlibs_F77=no - ;; - esac - fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -$as_echo "$ld_shlibs_F77" >&6; } -test "$ld_shlibs_F77" = no && can_build_shared=no -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_F77" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_F77=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_F77 in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_F77 - pic_flag=$lt_prog_compiler_pic_F77 - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_F77 - allow_undefined_flag_F77= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_F77=no - else - archive_cmds_need_lc_F77=yes - fi - allow_undefined_flag_F77=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -$as_echo "$archive_cmds_need_lc_F77" >&6; } - ;; - esac +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - ;; -esac - -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi library_names_spec= libname_spec='lib$name' soname_spec= @@ -18063,7 +11403,6 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" - need_lib_prefix=unknown hardcode_into_libs=no @@ -18100,7 +11439,7 @@ aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then : else can_build_shared=no @@ -18126,9 +11465,18 @@ ;; amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac ;; beos*) @@ -18151,25 +11499,28 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ dlpath=$dir/\$dldll~ - $rm \$dlpath' + $RM \$dlpath' shlibpath_overrides_runpath=yes case $host_os in @@ -18178,20 +11529,20 @@ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; - mingw*) + mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH printed by # mingw gcc, but we are running on Cygwin. Gcc prints its search # path with ; separators, and with drive letters. We can handle the # drive letters (cygwin fileutils understands them), so leave them, # especially as we might pass files found there to a mingw objdump, # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi ;; pw32*) @@ -18215,12 +11566,13 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -18313,18 +11665,18 @@ fi sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) shrext_cmds='.sl' dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH @@ -18401,6 +11753,32 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install # before this can be enabled. @@ -18408,7 +11786,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -18437,7 +11815,7 @@ version_type=sunos need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' @@ -18458,14 +11836,16 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) - version_type=linux +*nto* | *qnx*) + version_type=qnx need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' ;; openbsd*) @@ -18474,13 +11854,13 @@ need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; esac library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in openbsd2.[89] | openbsd2.[89].*) shlibpath_overrides_runpath=no @@ -18552,7 +11932,6 @@ sni) shlibpath_overrides_runpath=no need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' runpath_var=LD_RUN_PATH ;; siemens) @@ -18583,13 +11962,12 @@ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes hardcode_into_libs=yes if test "$with_gnu_ld" = yes; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes case $host_os in sco3.2v5*) sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" @@ -18599,6 +11977,17 @@ sys_lib_dlsearch_path_spec='/usr/lib' ;; +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -18610,513 +11999,795 @@ dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + fi -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi - -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var_F77" || \ - test "X$hardcode_automatic_F77" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported + ac_cv_lib_dl_dlopen=no fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -$as_echo "$hardcode_action_F77" >&6; } - -if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_F77 \ - CC_F77 \ - LD_F77 \ - lt_prog_compiler_wl_F77 \ - lt_prog_compiler_pic_F77 \ - lt_prog_compiler_static_F77 \ - lt_prog_compiler_no_builtin_flag_F77 \ - export_dynamic_flag_spec_F77 \ - thread_safe_flag_spec_F77 \ - whole_archive_flag_spec_F77 \ - enable_shared_with_static_runtimes_F77 \ - old_archive_cmds_F77 \ - old_archive_from_new_cmds_F77 \ - predep_objects_F77 \ - postdep_objects_F77 \ - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ - compiler_lib_search_dirs_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ - postuninstall_cmds_F77 \ - old_archive_from_expsyms_cmds_F77 \ - allow_undefined_flag_F77 \ - no_undefined_flag_F77 \ - export_symbols_cmds_F77 \ - hardcode_libdir_flag_spec_F77 \ - hardcode_libdir_flag_spec_ld_F77 \ - hardcode_libdir_separator_F77 \ - hardcode_automatic_F77 \ - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ - fix_srcfile_path_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - - case $var in - old_archive_cmds_F77 | \ - old_archive_from_new_cmds_F77 | \ - archive_cmds_F77 | \ - archive_expsym_cmds_F77 | \ - module_cmds_F77 | \ - module_expsym_cmds_F77 | \ - old_archive_from_expsyms_cmds_F77 | \ - export_symbols_cmds_F77 | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_F77 - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS +fi -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS +fi -# A language-specific compiler. -CC=$lt_compiler_F77 -# Is the compiler the GNU C compiler? -with_gcc=$GCC_F77 +fi -# An ERE matcher. -EGREP=$lt_EGREP -# The linker used to build libraries. -LD=$lt_LD_F77 +fi -# Whether we need hard or soft links. -LN_S=$lt_LN_S -# A BSD-compatible nm program. -NM=$lt_NM +fi -# A symbol stripping program -STRIP=$lt_STRIP + ;; + esac -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -# Used on cygwin: assembler. -AS="$AS" + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" -# The name of the directory that contains temporary libtool files. -objdir=$objdir + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 12434 "configure" +#include "confdefs.h" -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +#if HAVE_DLFCN_H +#include +#endif -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_F77 +#include -# Object file suffix (normally "o"). -objext="$ac_objext" +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif -# Old archive suffix (normally "a"). -libext="$libext" +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; -# Executable file suffix (normally ""). -exeext="$exeext" + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_F77 -pic_mode=$pic_mode + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } -# Must we lock files when doing compilation? -need_locks=$lt_need_locks + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line 12530 "configure" +#include "confdefs.h" -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix +#if HAVE_DLFCN_H +#include +#endif -# Do we need a version for libraries? -need_version=$need_version +#include -# Whether dlopen is supported. -dlopen_support=$enable_dlopen +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_F77 + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac -# Library versioning type. -version_type=$version_type + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac -# Format of library name prefix. -libname_spec=$lt_libname_spec + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_F77 -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_F77 -archive_expsym_cmds=$lt_archive_expsym_cmds_F77 -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_F77 -module_expsym_cmds=$lt_module_expsym_cmds_F77 -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_F77 - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_F77 - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_F77 -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_F77 -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -# This is the shared library runtime path variable. -runpath_var=$runpath_var -# This is the shared library path variable. -shlibpath_var=$shlibpath_var -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_F77 -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_F77 - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_F77 - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_F77 -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_F77 -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_F77 + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_F77 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_F77 -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_F77 -# ### END LIBTOOL TAG CONFIG: $tagname +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -__EOF__ +CC="$lt_save_CC" -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +archive_cmds_need_lc_CXX=no +allow_undefined_flag_CXX= +always_export_symbols_CXX=no +archive_expsym_cmds_CXX= +compiler_needs_object_CXX=no +export_dynamic_flag_spec_CXX= +hardcode_direct_CXX=no +hardcode_direct_absolute_CXX=no +hardcode_libdir_flag_spec_CXX= +hardcode_libdir_flag_spec_ld_CXX= +hardcode_libdir_separator_CXX= +hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported +hardcode_automatic_CXX=no +inherit_rpath_CXX=no +module_cmds_CXX= +module_expsym_cmds_CXX= +link_all_deplibs_CXX=unknown +old_archive_cmds_CXX=$old_archive_cmds +no_undefined_flag_CXX= +whole_archive_flag_spec_CXX= +enable_shared_with_static_runtimes_CXX=no -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Source file extension for C++ test sources. +ac_ext=cpp -CC="$lt_save_CC" +# Object file extension for compiled C++ test sources. +objext=o +objext_CXX=$objext - else - tagname="" - fi - ;; +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[]) { return(0); }' + # ltmain only uses $CC for tagged configurations so make sure $CC is set. -# Source file extension for Java test sources. -ac_ext=java -# Object file extension for compiled Java test sources. -objext=o -objext_GCJ=$objext -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' -# ltmain only uses $CC for tagged configurations so make sure $CC is set. # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} @@ -19128,26 +12799,42 @@ compiler=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +$RM conftest* -ac_outfile=conftest.$ac_objext + ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* +$RM -r conftest* -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -compiler_GCJ=$CC -for cc_temp in $compiler""; do + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + compiler=$CC + compiler_CXX=$CC + for cc_temp in $compiler""; do case $cc_temp in compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; @@ -19155,3598 +12842,3437 @@ *) break;; esac done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -# GCJ did not exist at the time GCC didn't implicitly link libc in. -archive_cmds_need_lc_GCJ=no - -old_archive_cmds_GCJ=$old_archive_cmds + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' + else + lt_prog_compiler_no_builtin_flag_CXX= + fi -lt_prog_compiler_no_builtin_flag_GCJ= + if test "$GXX" = yes; then + # Set up default GNU C++ configuration -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - $as_echo_n "(cached) " >&6 +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19191: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:19195: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $rm conftest* - + with_gnu_ld=no fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - : -fi - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi - -lt_prog_compiler_wl_GCJ= -lt_prog_compiler_pic_GCJ= -lt_prog_compiler_static_GCJ= - -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_static_GCJ='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_GCJ='-fno-common' - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared_GCJ=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_GCJ=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_GCJ='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' - else - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' - fi - ;; - darwin*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - case $cc_basename in - xlc*) - lt_prog_compiler_pic_GCJ='-qnocommon' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - esac - ;; - - mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_GCJ='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default +if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld - newsos6) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-static' - ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-fpic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - lt_prog_compiler_wl_GCJ='-Wl,' - ;; - *Sun\ F*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - lt_prog_compiler_wl_GCJ='' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - rdos*) - lt_prog_compiler_static_GCJ='-non_shared' - ;; - solaris*) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl_GCJ='-Qoption ld ';; - *) - lt_prog_compiler_wl_GCJ='-Wl,';; - esac - ;; - sunos4*) - lt_prog_compiler_wl_GCJ='-Qoption ld ' - lt_prog_compiler_pic_GCJ='-PIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_CXX= + fi + else + with_gnu_ld=no + wlarc= - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_GCJ='-Kconform_pic' - lt_prog_compiler_static_GCJ='-Bstatic' + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - unicos*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_can_build_shared_GCJ=no - ;; + else + GXX=no + with_gnu_ld=no + wlarc= + fi - uts4*) - lt_prog_compiler_pic_GCJ='-pic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; + # PORTME: fill in a description of your system's C++ link characteristics + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no - *) - lt_prog_compiler_can_build_shared_GCJ=no - ;; - esac - fi + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_GCJ"; then + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_CXX='' + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + file_list_spec_CXX='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct_CXX=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_CXX=yes + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_libdir_separator_CXX= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19481: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:19485: \$? = $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. - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_GCJ=yes - fi - fi - $rm conftest* + export_dynamic_flag_spec_CXX='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + always_export_symbols_CXX=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } +int +main () +{ -if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; - esac -else - lt_prog_compiler_pic_GCJ= - lt_prog_compiler_can_build_shared_GCJ=no -fi + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_GCJ= - ;; - *) - lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" - ;; -esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_GCJ=yes - fi - else - lt_cv_prog_compiler_static_works_GCJ=yes - fi - fi - $rm -r conftest* - LDFLAGS="$save_LDFLAGS" + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_CXX="-z nodefs" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then - : -else - lt_prog_compiler_static_GCJ= +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + archive_cmds_need_lc_CXX=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_GCJ=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19585: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:19589: \$? = $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 - # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_GCJ=yes - fi - fi - chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + darwin* | rhapsody*) -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=echo + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn + else + ld_shlibs_CXX=no fi -else - need_locks=no -fi -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ;; - runpath_var= - allow_undefined_flag_GCJ= - enable_shared_with_static_runtimes_GCJ=no - archive_cmds_GCJ= - archive_expsym_cmds_GCJ= - old_archive_From_new_cmds_GCJ= - old_archive_from_expsyms_cmds_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= - thread_safe_flag_spec_GCJ= - hardcode_libdir_flag_spec_GCJ= - hardcode_libdir_flag_spec_ld_GCJ= - hardcode_libdir_separator_GCJ= - hardcode_direct_GCJ=no - hardcode_minus_L_GCJ=no - hardcode_shlibpath_var_GCJ=unsupported - link_all_deplibs_GCJ=unknown - hardcode_automatic_GCJ=no - module_cmds_GCJ= - module_expsym_cmds_GCJ= - always_export_symbols_GCJ=no - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_GCJ= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - # Just being paranoid about ensuring that cc_basename is set. - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac + freebsd[12]*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + ld_shlibs_CXX=no + ;; - ld_shlibs_GCJ=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_GCJ= - fi - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes + ;; - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no - cat <&2 + gnu*) + ;; -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. + hpux9*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; -EOF - fi - ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: - amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_GCJ=no - ;; + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + ;; + *) + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; + interix[3-9]*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + fi + fi + link_all_deplibs_CXX=yes + ;; + esac + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + inherit_rpath_CXX=yes + ;; - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_GCJ='-L$libdir' - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [1-5]* | *pgcpp\ [1-5]*) + prelink_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + old_archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $RANLIB $oldlib' + archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 will use weak symbols + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_GCJ=no - fi - ;; + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - interix[3-9]*) - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_GCJ='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' - ;; + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: - gnu* | linux* | k*bsd*-gnu) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + xl*) + # IBM XL 8.0 on PPC, with GNU ld + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object_CXX=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - *) - tmp_sharedflag='-shared' ;; + ;; + + lynxos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; esac - archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + ;; - if test $supports_anon_versioning = yes; then - archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no fi - link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi - ;; + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; + *nto* | *qnx*) + ld_shlibs_CXX=yes + ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_GCJ=no - cat <&2 + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + hardcode_direct_absolute_CXX=yes + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=echo + else + ld_shlibs_CXX=no + fi + ;; -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx*) + case $host in + osf3*) + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + ;; + *) + allow_undefined_flag_CXX=' -expect_unresolved \*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + ;; + esac + + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' + ;; + esac + link_all_deplibs_CXX=yes + + output_verbose_link_cmd='echo' - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs_GCJ=no - cat <<_LT_EOF 1>&2 + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. + # The C++ compiler must be used to create the archive. + old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; -_LT_EOF - ;; + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; esac ;; - sunos4*) - archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; esac - if test "$ld_shlibs_GCJ" = no; then - runpath_var= - hardcode_libdir_flag_spec_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=yes - archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L_GCJ=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_GCJ=unsupported - fi - ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no + GCC_CXX="$GXX" + LD_CXX="$LD" - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + # Dependencies to place before and after the object being linked: +predep_objects_CXX= +postdep_objects_CXX= +predeps_CXX= +postdeps_CXX= +compiler_lib_search_path_CXX= - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. - archive_cmds_GCJ='' - hardcode_direct_GCJ=yes - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_GCJ=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_GCJ=yes - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_libdir_separator_GCJ= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi + for p in `eval "$output_verbose_link_cmd"`; do + case $p in - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_GCJ=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_GCJ='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + else + prev= + fi -int -main () -{ + if test "$pre_test_object_deps_done" = no; then + case $p in + -L* | -R*) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$compiler_lib_search_path_CXX"; then + compiler_lib_search_path_CXX="${prev}${p}" + else + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$postdeps_CXX"; then + postdeps_CXX="${prev}${p}" + else + postdeps_CXX="${postdeps_CXX} ${prev}${p}" + fi + fi + ;; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + if test "$pre_test_object_deps_done" = no; then + if test -z "$predep_objects_CXX"; then + predep_objects_CXX="$p" + else + predep_objects_CXX="$predep_objects_CXX $p" + fi + else + if test -z "$postdep_objects_CXX"; then + postdep_objects_CXX="$p" + else + postdep_objects_CXX="$postdep_objects_CXX $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + echo "libtool.m4: error: problem compiling CXX test program" +fi +$RM -f confest.$objext + +# PORTME: override above test on systems where it is broken +case $host_os in +interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; -fi +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_GCJ="-z nodefs" - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; -int -main () -{ +solaris*) + case $cc_basename in + CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + +case " $postdeps_CXX " in +*" -lc "*) archive_cmds_need_lc_CXX=no ;; +esac + compiler_lib_search_dirs_CXX= +if test -n "${compiler_lib_search_path_CXX}"; then + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_GCJ=' ${wl}-bernotok' - allow_undefined_flag_GCJ=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ='$convenience' - archive_cmds_need_lc_GCJ=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_GCJ=no - ;; - bsdi[45]*) - export_dynamic_flag_spec_GCJ=-rdynamic - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_GCJ=' ' - allow_undefined_flag_GCJ=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_GCJ='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_GCJ=yes - ;; - darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac - archive_cmds_need_lc_GCJ=no - hardcode_direct_GCJ=no - hardcode_automatic_GCJ=yes - hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='' - link_all_deplibs_GCJ=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' - archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - else - case $cc_basename in - xlc*) - output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - ;; - *) - ld_shlibs_GCJ=no - ;; - esac - fi - ;; - dgux*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no - ;; - freebsd1*) - ld_shlibs_GCJ=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - hpux9*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - ;; - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - fi - ;; - hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' - hardcode_direct_GCJ=no - hardcode_shlibpath_var_GCJ=no - ;; - *) - hardcode_direct_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' - fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - link_all_deplibs_GCJ=yes - ;; - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - newsos6) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_shlibpath_var_GCJ=no - ;; - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs_GCJ=no - fi - ;; - os2*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - allow_undefined_flag_GCJ=unsupported - archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - ;; - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_GCJ='-rpath $libdir' - fi - hardcode_libdir_separator_GCJ=: - ;; - solaris*) - no_undefined_flag_GCJ=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else - wlarc='' - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_shlibpath_var_GCJ=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs_GCJ=yes - ;; - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + lt_prog_compiler_wl_CXX= +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' fi - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no ;; - sysv4) - case $host_vendor in - sni) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_GCJ='$CC -r -o $output$reload_objs' - hardcode_direct_GCJ=no + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_CXX='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; - motorola) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie - ;; esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no ;; - sysv4.3*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='-Bexport' + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_CXX='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. ;; - sysv4*MP*) if test -d /usr/nec; then - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_GCJ=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_GCJ='${wl}-z,text' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + lt_prog_compiler_pic_CXX=-Kconform_pic fi ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_GCJ='${wl}-z,text' - allow_undefined_flag_GCJ='${wl}-z,nodefs' - archive_cmds_need_lc_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac ;; - - uts4*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' ;; - *) - ld_shlibs_GCJ=no + lt_prog_compiler_pic_CXX='-fPIC' ;; esac - fi - -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -$as_echo "$ld_shlibs_GCJ" >&6; } -test "$ld_shlibs_GCJ" = no && can_build_shared=no - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_GCJ" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_GCJ=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_GCJ in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_GCJ - pic_flag=$lt_prog_compiler_pic_GCJ - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ - allow_undefined_flag_GCJ= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_GCJ=no - else - archive_cmds_need_lc_GCJ=yes - fi - allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -$as_echo "$archive_cmds_need_lc_GCJ" >&6; } - ;; + else + case $host_os in + aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + else + lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + dgux*) + case $cc_basename in + ec++*) + lt_prog_compiler_pic_CXX='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; + aCC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_CXX='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + lt_prog_compiler_wl_CXX='--backend -Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + lt_prog_compiler_static_CXX='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + xlc* | xlC*) + # IBM XL 8.0 on PPC + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-qpic' + lt_prog_compiler_static_CXX='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + lt_prog_compiler_pic_CXX='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + lt_prog_compiler_wl_CXX='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + lt_prog_compiler_pic_CXX='-pic' + ;; + cxx*) + # Digital/Compaq C++ + lt_prog_compiler_wl_CXX='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + lt_prog_compiler_pic_CXX='-pic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + lcc*) + # Lucid + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + lt_prog_compiler_pic_CXX='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + lt_prog_compiler_can_build_shared_CXX=no + ;; esac fi - ;; -esac - -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" - -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_CXX= ;; - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:14486: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:14490: \$? = $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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } + +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; + esac +else + lt_prog_compiler_pic_CXX= + lt_prog_compiler_can_build_shared_CXX=no +fi -freebsd1*) - dynamic_linker=no - ;; +fi -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works_CXX=yes + fi + else + lt_cv_prog_compiler_static_works_CXX=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:14585: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:14589: \$? = $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 + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -nto-qnx*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:14637: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:14641: \$? = $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 + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; -rdos*) - dynamic_linker=no - ;; -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn fi - need_version=yes - ;; +else + need_locks=no +fi -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" ;; - -*) - dynamic_linker=no + cygwin* | mingw* | cegcc*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ;; -esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no + linux* | k*bsd*-gnu) + link_all_deplibs_CXX=no + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -fi +with_gnu_ld_CXX=$with_gnu_ld -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ - test "X$hardcode_automatic_GCJ" = "Xyes" ; then - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -$as_echo "$hardcode_action_GCJ" >&6; } -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_CXX" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_CXX=yes -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_GCJ \ - CC_GCJ \ - LD_GCJ \ - lt_prog_compiler_wl_GCJ \ - lt_prog_compiler_pic_GCJ \ - lt_prog_compiler_static_GCJ \ - lt_prog_compiler_no_builtin_flag_GCJ \ - export_dynamic_flag_spec_GCJ \ - thread_safe_flag_spec_GCJ \ - whole_archive_flag_spec_GCJ \ - enable_shared_with_static_runtimes_GCJ \ - old_archive_cmds_GCJ \ - old_archive_from_new_cmds_GCJ \ - predep_objects_GCJ \ - postdep_objects_GCJ \ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ - compiler_lib_search_dirs_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ - postuninstall_cmds_GCJ \ - old_archive_from_expsyms_cmds_GCJ \ - allow_undefined_flag_GCJ \ - no_undefined_flag_GCJ \ - export_symbols_cmds_GCJ \ - hardcode_libdir_flag_spec_GCJ \ - hardcode_libdir_flag_spec_ld_GCJ \ - hardcode_libdir_separator_GCJ \ - hardcode_automatic_GCJ \ - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ - fix_srcfile_path_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - - case $var in - old_archive_cmds_GCJ | \ - old_archive_from_new_cmds_GCJ | \ - archive_cmds_GCJ | \ - archive_expsym_cmds_GCJ | \ - module_cmds_GCJ | \ - module_expsym_cmds_GCJ | \ - old_archive_from_expsyms_cmds_GCJ | \ - export_symbols_cmds_GCJ | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_CXX in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + archive_cmds_need_lc_CXX=no + else + archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 +$as_echo "$archive_cmds_need_lc_CXX" >&6; } ;; esac - done + fi + ;; +esac - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac -cfgfile="$ofile" - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_GCJ -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS -# A language-specific compiler. -CC=$lt_compiler_GCJ -# Is the compiler the GNU C compiler? -with_gcc=$GCC_GCJ -# An ERE matcher. -EGREP=$lt_EGREP -# The linker used to build libraries. -LD=$lt_LD_GCJ -# Whether we need hard or soft links. -LN_S=$lt_LN_S -# A BSD-compatible nm program. -NM=$lt_NM -# A symbol stripping program -STRIP=$lt_STRIP -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" -# Used on cygwin: assembler. -AS="$AS" -# The name of the directory that contains temporary libtool files. -objdir=$objdir -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_GCJ -# Object file suffix (normally "o"). -objext="$ac_objext" -# Old archive suffix (normally "a"). -libext="$libext" -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' -# Executable file suffix (normally ""). -exeext="$exeext" -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_GCJ -pic_mode=$pic_mode -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -# Must we lock files when doing compilation? -need_locks=$lt_need_locks -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix -# Do we need a version for libraries? -need_version=$need_version -# Whether dlopen is supported. -dlopen_support=$enable_dlopen -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_GCJ -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ -# Library versioning type. -version_type=$version_type -# Format of library name prefix. -libname_spec=$lt_libname_spec -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_GCJ -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_GCJ -archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_GCJ -module_expsym_cmds=$lt_module_expsym_cmds_GCJ -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_GCJ - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_GCJ - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_GCJ -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_GCJ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no -# This is the shared library runtime path variable. -runpath_var=$runpath_var + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes -# This is the shared library path variable. -shlibpath_var=$shlibpath_var + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_GCJ +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_GCJ - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_GCJ - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_GCJ +freebsd1*) + dynamic_linker=no + ;; -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_GCJ +gnu*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +interix[3-9]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_GCJ +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_GCJ +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # Some binutils ld are patched to set DT_RUNPATH + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds +int +main () +{ -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_GCJ + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_GCJ + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -# ### END LIBTOOL TAG CONFIG: $tagname + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi -__EOF__ + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' fi -fi - + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -CC="$lt_save_CC" +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; - else - tagname="" - fi +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; - RC) +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; -# Source file extension for RC test sources. -ac_ext=rc +rdos*) + dynamic_linker=no + ;; -# Object file extension for compiled RC test sources. -objext=o -objext_RC=$objext +solaris*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -# Allow CC to be a program name with arguments. -compiler=$CC +uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$rm conftest* +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$rm -r conftest* -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -compiler_RC=$CC -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -lt_cv_prog_compiler_c_o_RC=yes -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_RC \ - CC_RC \ - LD_RC \ - lt_prog_compiler_wl_RC \ - lt_prog_compiler_pic_RC \ - lt_prog_compiler_static_RC \ - lt_prog_compiler_no_builtin_flag_RC \ - export_dynamic_flag_spec_RC \ - thread_safe_flag_spec_RC \ - whole_archive_flag_spec_RC \ - enable_shared_with_static_runtimes_RC \ - old_archive_cmds_RC \ - old_archive_from_new_cmds_RC \ - predep_objects_RC \ - postdep_objects_RC \ - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ - compiler_lib_search_dirs_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ - postuninstall_cmds_RC \ - old_archive_from_expsyms_cmds_RC \ - allow_undefined_flag_RC \ - no_undefined_flag_RC \ - export_symbols_cmds_RC \ - hardcode_libdir_flag_spec_RC \ - hardcode_libdir_flag_spec_ld_RC \ - hardcode_libdir_separator_RC \ - hardcode_automatic_RC \ - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ - fix_srcfile_path_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - - case $var in - old_archive_cmds_RC | \ - old_archive_from_new_cmds_RC | \ - archive_cmds_RC | \ - archive_expsym_cmds_RC | \ - module_cmds_RC | \ - module_expsym_cmds_RC | \ - old_archive_from_expsyms_cmds_RC | \ - export_symbols_cmds_RC | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac -cfgfile="$ofile" - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_RC -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os -# An echo program that does not interpret backslashes. -echo=$lt_echo -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS -# A C compiler. -LTCC=$lt_LTCC -# LTCC compiler flags. -LTCFLAGS=$lt_LTCFLAGS -# A language-specific compiler. -CC=$lt_compiler_RC -# Is the compiler the GNU C compiler? -with_gcc=$GCC_RC -# An ERE matcher. -EGREP=$lt_EGREP -# The linker used to build libraries. -LD=$lt_LD_RC -# Whether we need hard or soft links. -LN_S=$lt_LN_S -# A BSD-compatible nm program. -NM=$lt_NM -# A symbol stripping program -STRIP=$lt_STRIP -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" -# Used on cygwin: assembler. -AS="$AS" -# The name of the directory that contains temporary libtool files. -objdir=$objdir -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_RC -# Object file suffix (normally "o"). -objext="$ac_objext" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || + test -n "$runpath_var_CXX" || + test "X$hardcode_automatic_CXX" = "Xyes" ; then -# Old archive suffix (normally "a"). -libext="$libext" + # We can hardcode non-existent directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +$as_echo "$hardcode_action_CXX" >&6; } -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' +if test "$hardcode_action_CXX" = relink || + test "$inherit_rpath_CXX" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi -# Executable file suffix (normally ""). -exeext="$exeext" -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_RC -pic_mode=$pic_mode -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -# Must we lock files when doing compilation? -need_locks=$lt_need_locks -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix -# Do we need a version for libraries? -need_version=$need_version + fi # test -n "$compiler" -# Whether dlopen is supported. -dlopen_support=$enable_dlopen + CC=$lt_save_CC + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_RC -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC -# Library versioning type. -version_type=$version_type -# Format of library name prefix. -libname_spec=$lt_libname_spec -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_RC -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC + ac_config_commands="$ac_config_commands libtool" -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_RC -archive_expsym_cmds=$lt_archive_expsym_cmds_RC -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_RC -module_expsym_cmds=$lt_module_expsym_cmds_RC -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_RC - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_RC - -# The directories searched by this compiler when creating a shared -# library -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC +# Only expand once: -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method +LIBTOOL="$LIBTOOL --silent" -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd +# autoscan start -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_RC +# Checks for header files. +for ac_header in fcntl.h fnmatch.h glob.h regex.h stdlib.h sys/time.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_RC +fi -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds +done -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +# Checks for typedefs, structures, and compiler characteristics. +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = x""yes; then : -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +else -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +cat >>confdefs.h <<_ACEOF +#define off_t long int +_ACEOF -# This is the shared library runtime path variable. -runpath_var=$runpath_var +fi -# This is the shared library path variable. -shlibpath_var=$shlibpath_var +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath +else -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_RC +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs +fi -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +if test "${ac_cv_struct_tm+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_RC - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_RC - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_RC - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_RC +int +main () +{ +struct tm tm; + int *p = &tm.tm_sec; + return !p; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_tm=time.h +else + ac_cv_struct_tm=sys/time.h +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 +$as_echo "$ac_cv_struct_tm" >&6; } +if test $ac_cv_struct_tm = sys/time.h; then -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_RC +fi -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Checks for library functions. +for ac_func in gethostname ftruncate fgetpos mkstemp regcomp strerror strstr +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path +fi +done -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_RC -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_RC +# autoscan end -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_RC +# 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 -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_RC +cat >>confdefs.h <<_ACEOF +#define REVISION "$REVISION" +_ACEOF -# ### END LIBTOOL TAG CONFIG: $tagname -__EOF__ +# Check whether --enable-binreloc was given. +if test "${enable_binreloc+set}" = set; then : + enableval=$enable_binreloc; enable_binreloc=$enableval else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi + enable_binreloc=no fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether binary relocation support should be enabled" >&5 +$as_echo_n "checking whether binary relocation support should be enabled... " >&6; } +if test "$enable_binreloc" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker mappings at /proc/self/maps" >&5 +$as_echo_n "checking for linker mappings at /proc/self/maps... " >&6; } + if test -e /proc/self/maps; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error "/proc/self/maps is not available. Binary relocation cannot be enabled." "$LINENO" 5 + enable_binreloc="no" + fi - ;; +elif test "$enable_binreloc" = "auto"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes when available" >&5 +$as_echo "yes when available" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker mappings at /proc/self/maps" >&5 +$as_echo_n "checking for linker mappings at /proc/self/maps... " >&6; } + if test -e /proc/self/maps; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_binreloc=yes - *) - { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether everything is installed to the same prefix" >&5 +$as_echo_n "checking whether everything is installed to the same prefix... " >&6; } + 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: Binary relocation support will be disabled." >&5 +$as_echo "$as_me: Binary relocation support will be disabled." >&6;} + enable_binreloc=no + fi - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_binreloc=no + fi - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} - { (exit 1); exit 1; }; } - fi +elif test "$enable_binreloc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (unknown value \"$enable_binreloc\")" >&5 +$as_echo "no (unknown value \"$enable_binreloc\")" >&6; } + enable_binreloc=no fi +if test "$enable_binreloc" = "yes"; then +$as_echo "#define ENABLE_BINRELOC /**/" >>confdefs.h - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -# Prevent multiple expansion - +fi +# GTK checks +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. +set dummy ${ac_tool_prefix}pkg-config; 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_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; 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_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + 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 + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + 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" && \ + { { $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=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$gtk_modules" 2>/dev/null` +else + pkg_failed=yes +fi + fi +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" && \ + { { $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=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$gtk_modules" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test $pkg_failed = yes; then +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gtk_modules"` + else + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gtk_modules"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 + as_fn_error "Package requirements ($gtk_modules) were not met: -LIBTOOL="$LIBTOOL --silent" +$GTK_PKG_ERRORS -# autoscan start +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# Checks for header files. +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 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi +# GIO checks +gio_modules="gio-2.0 >= 2.16" +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5 +$as_echo_n "checking for GIO... " >&6; } -for ac_header in fcntl.h fnmatch.h glob.h regex.h stdlib.h sys/time.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&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" && \ + { { $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=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "$gio_modules" 2>/dev/null` +else + pkg_failed=yes fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + fi else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + 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" && \ + { { $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=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "$gio_modules" 2>/dev/null` else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no + pkg_failed=yes +fi + fi +else + pkg_failed=untried fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + _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"` + else + GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gio_modules"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GIO_PKG_ERRORS" >&5 - ac_header_preproc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_gio=0 +elif test $pkg_failed = untried; then + have_gio=0 +else + GIO_CFLAGS=$pkg_cv_GIO_CFLAGS + GIO_LIBS=$pkg_cv_GIO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_gio=1 fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +if test $have_gio = 1 ; then - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +$as_echo "#define HAVE_GIO 1" >>confdefs.h fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +# --disable-deprecated switch for GTK2 purification +# Check whether --enable-deprecated was given. +if test "${enable_deprecated+set}" = set; then : + enableval=$enable_deprecated; GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" fi -done - -# Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:$LINENO: checking for off_t" >&5 -$as_echo_n "checking for off_t... " >&6; } -if test "${ac_cv_type_off_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_off_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof (off_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof ((off_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : +# Plugins support +# Check whether --enable-plugins was given. +if test "${enable_plugins+set}" = set; then : + enableval=$enable_plugins; else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_off_t=yes + enable_plugins=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if test "x$enable_plugins" = "xyes" ; then -fi +$as_echo "#define HAVE_PLUGINS 1" >>confdefs.h -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -$as_echo "$ac_cv_type_off_t" >&6; } -if test "x$ac_cv_type_off_t" = x""yes; then - : + if true; then + PLUGINS_TRUE= + PLUGINS_FALSE='#' else - -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF - + PLUGINS_TRUE='#' + PLUGINS_FALSE= fi -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5 -$as_echo_n "checking for size_t... " >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - $as_echo_n "(cached) " >&6 else - ac_cv_type_size_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if (sizeof ((size_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : + if false; then + PLUGINS_TRUE= + PLUGINS_FALSE='#' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + PLUGINS_TRUE='#' + PLUGINS_FALSE= +fi - ac_cv_type_size_t=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Use included GNU regex library +# Check whether --enable-gnu-regex was given. +if test "${enable_gnu_regex+set}" = set; then : + enableval=$enable_gnu_regex; else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + enable_gnu_regex=no +fi -fi +if test "x$enable_gnu_regex" = "xyes" ; then -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -$as_echo "$ac_cv_type_size_t" >&6; } -if test "x$ac_cv_type_size_t" = x""yes; then - : +$as_echo "#define USE_INCLUDED_REGEX 1" >>confdefs.h + + +$as_echo "#define HAVE_REGCOMP 1" >>confdefs.h + + if true; then + USE_INCLUDED_REGEX_TRUE= + USE_INCLUDED_REGEX_FALSE='#' else + USE_INCLUDED_REGEX_TRUE='#' + USE_INCLUDED_REGEX_FALSE= +fi -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +else + if false; then + USE_INCLUDED_REGEX_TRUE= + USE_INCLUDED_REGEX_FALSE='#' +else + USE_INCLUDED_REGEX_TRUE='#' + USE_INCLUDED_REGEX_FALSE= +fi fi -{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if test "${ac_cv_struct_tm+set}" = set; then +case "${host}" in + *mingw*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fnmatch in -liberty" >&5 +$as_echo_n "checking for fnmatch in -liberty... " >&6; } +if test "${ac_cv_lib_iberty_fnmatch+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-liberty $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fnmatch (); int main () { -struct tm tm; - int *p = &tm.tm_sec; - return !p; +return fnmatch (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_struct_tm=time.h +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_iberty_fnmatch=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_struct_tm=sys/time.h + ac_cv_lib_iberty_fnmatch=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_fnmatch" >&5 +$as_echo "$ac_cv_lib_iberty_fnmatch" >&6; } +if test "x$ac_cv_lib_iberty_fnmatch" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBIBERTY 1 +_ACEOF + + LIBS="-liberty $LIBS" + +else + + as_fn_error "fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details." "$LINENO" 5 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -$as_echo "$ac_cv_struct_tm" >&6; } -if test $ac_cv_struct_tm = sys/time.h; then -cat >>confdefs.h <<\_ACEOF -#define TM_IN_SYS_TIME 1 + +cat >>confdefs.h <<_ACEOF +#define WIN32 1 _ACEOF -fi + want_vte="no" + want_socket="yes" +$as_echo "#define HAVE_SOCKET 1" >>confdefs.h -# Checks for library functions. + if true; then + MINGW_TRUE= + MINGW_FALSE='#' +else + MINGW_TRUE='#' + MINGW_FALSE= +fi + + ;; + *) + if false; then + MINGW_TRUE= + MINGW_FALSE='#' +else + MINGW_TRUE='#' + MINGW_FALSE= +fi + ;; +esac +if test "x$want_socket" = "x"; then + # socket support + # Check whether --enable-socket was given. +if test "${enable_socket+set}" = set; then : + enableval=$enable_socket; want_socket="$enableval" +else + want_socket="yes" +fi + if test "x$want_socket" = "xyes"; then +$as_echo "#define HAVE_SOCKET 1" >>confdefs.h -for ac_func in gethostname ftruncate fgetpos mkstemp regcomp strerror strstr -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + # this should bring in libsocket on Solaris: + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing connect" >&5 +$as_echo_n "checking for library containing connect... " >&6; } +if test "${ac_cv_search_connect+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -22754,3983 +16280,3448 @@ #ifdef __cplusplus extern "C" #endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - +char connect (); int main () { -return $ac_func (); +return connect (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_connect=$ac_res fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_connect+set}" = set; then : + break fi done +if test "${ac_cv_search_connect+set}" = set; then : - -# 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" + ac_cv_search_connect=no fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_connect" >&5 +$as_echo "$ac_cv_search_connect" >&6; } +ac_res=$ac_cv_search_connect +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -cat >>confdefs.h <<_ACEOF -#define REVISION "$REVISION" -_ACEOF - - +fi + fi +fi -# Check whether --enable-binreloc was given. -if test "${enable_binreloc+set}" = set; then - enableval=$enable_binreloc; enable_binreloc=$enableval +if test "x$want_vte" = "x"; then + # VTE support + # Check whether --enable-vte was given. +if test "${enable_vte+set}" = set; then : + enableval=$enable_vte; want_vte="$enableval" else - enable_binreloc=no + want_vte="yes" fi + if test "x$want_vte" = "xyes"; then -{ $as_echo "$as_me:$LINENO: checking whether binary relocation support should be enabled" >&5 -$as_echo_n "checking whether binary relocation support should be enabled... " >&6; } -if test "$enable_binreloc" = "yes"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking for linker mappings at /proc/self/maps" >&5 -$as_echo_n "checking for linker mappings at /proc/self/maps... " >&6; } - if test -e /proc/self/maps; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: /proc/self/maps is not available. Binary relocation cannot be enabled." >&5 -$as_echo "$as_me: error: /proc/self/maps is not available. Binary relocation cannot be enabled." >&2;} - { (exit 1); exit 1; }; } - enable_binreloc="no" - fi - -elif test "$enable_binreloc" = "auto"; then - { $as_echo "$as_me:$LINENO: result: yes when available" >&5 -$as_echo "yes when available" >&6; } - { $as_echo "$as_me:$LINENO: checking for linker mappings at /proc/self/maps" >&5 -$as_echo_n "checking for linker mappings at /proc/self/maps... " >&6; } - if test -e /proc/self/maps; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - enable_binreloc=yes - - { $as_echo "$as_me:$LINENO: checking whether everything is installed to the same prefix" >&5 -$as_echo_n "checking whether everything is installed to the same prefix... " >&6; } - 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 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:$LINENO: Binary relocation support will be disabled." >&5 -$as_echo "$as_me: Binary relocation support will be disabled." >&6;} - enable_binreloc=no - fi - - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - enable_binreloc=no - fi +$as_echo "#define HAVE_VTE 1" >>confdefs.h -elif test "$enable_binreloc" = "no"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no (unknown value \"$enable_binreloc\")" >&5 -$as_echo "no (unknown value \"$enable_binreloc\")" >&6; } - enable_binreloc=no -fi -if test "$enable_binreloc" = "yes"; then + fi -cat >>confdefs.h <<\_ACEOF -#define ENABLE_BINRELOC /**/ +# Check whether --with-vte-module-path was given. +if test "${with_vte_module_path+set}" = set; then : + withval=$with_vte_module_path; +cat >>confdefs.h <<_ACEOF +#define VTE_MODULE_PATH "$withval" _ACEOF fi +fi -# GTK checks -gtk_modules="gtk+-2.0 >= 2.8.0" - +GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.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. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } +# GTK 2.10 printing support +$PKG_CONFIG --exists 'gtk+-2.0 >= 2.10.0' +if test "x$?" = "x0" ; then + enable_printing="yes" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + enable_printing="no (GTK >= 2.10 necessary)" fi -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 +# just for a laugh (it has absolutely no effect) +# Check whether --enable-the-force was given. +if test "${enable_the_force+set}" = set; then : + enableval=$enable_the_force; be_luke="$enableval" else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac + be_luke="no" fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the force is with you" >&5 +$as_echo_n "checking whether the force is with you... " >&6; } +if test "x$be_luke" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$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 - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi +# i18n +GETTEXT_PACKAGE=geany + + +cat >>confdefs.h <<_ACEOF +#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" +_ACEOF -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi + +ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS + + + for ac_header in locale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LOCALE_H 1 +_ACEOF fi -pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for GTK" >&5 -$as_echo_n "checking for GTK... " >&6; } +done -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$gtk_modules" 2>/dev/null` + if test $ac_cv_header_locale_h = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes -fi - fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +return LC_MESSAGES + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes else - pkg_failed=untried + am_cv_val_LC_MESSAGES=no 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" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$gtk_modules" 2>/dev/null` -else - pkg_failed=yes +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + fi -else - pkg_failed=untried -fi + fi + USE_NLS=yes + gt_cv_have_gettext=no -if test $pkg_failed = yes; then + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = x""yes; then : + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + # + # First check in libc + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 +$as_echo_n "checking for ngettext in libc... " >&6; } +if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - _pkg_short_errors_supported=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main () +{ +return !ngettext ("","", 1) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_ngettext_libc=yes +else + gt_cv_func_ngettext_libc=no fi - if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gtk_modules"` - else - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gtk_modules"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTK_PKG_ERRORS" >&5 +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext - { { $as_echo "$as_me:$LINENO: error: Package requirements ($gtk_modules) were not met: +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 +$as_echo "$gt_cv_func_ngettext_libc" >&6; } -$GTK_PKG_ERRORS + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 +$as_echo_n "checking for dgettext in libc... " >&6; } +if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +#include -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. -" >&5 -$as_echo "$as_me: error: Package requirements ($gtk_modules) were not met: +int +main () +{ +return !dgettext ("","") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes +else + gt_cv_func_dgettext_libc=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -$GTK_PKG_ERRORS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 +_ACEOF -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. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +fi +done -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. + fi -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -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. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char bindtextdomain (); +int +main () +{ +return bindtextdomain (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_bindtextdomain=yes else - GTK_CFLAGS=$pkg_cv_GTK_CFLAGS - GTK_LIBS=$pkg_cv_GTK_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - : + ac_cv_lib_intl_bindtextdomain=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 +$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - -# GIO checks -gio_modules="gio-2.0 >= 2.16" - -pkg_failed=no -{ $as_echo "$as_me:$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" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gio_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gio_modules") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "$gio_modules" 2>/dev/null` +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ngettext (); +int +main () +{ +return ngettext (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes else - pkg_failed=yes + ac_cv_lib_intl_ngettext=no fi - fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 +$as_echo_n "checking for dgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dgettext (); +int +main () +{ +return dgettext (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dgettext=yes else - pkg_failed=untried + ac_cv_lib_intl_dgettext=no 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" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gio_modules\"") >&5 - ($PKG_CONFIG --exists --print-errors "$gio_modules") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "$gio_modules" 2>/dev/null` -else - pkg_failed=yes +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - fi -else - pkg_failed=untried +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 +$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes fi +fi +fi -if test $pkg_failed = yes; then -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 +$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else - _pkg_short_errors_supported=no + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl -liconv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ngettext (); +int +main () +{ +return ngettext (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_ngettext=yes +else + ac_cv_lib_intl_ngettext=no fi - if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gio_modules"` - else - GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gio_modules"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GIO_PKG_ERRORS" >&5 +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 +$as_echo_n "checking for dcgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl -liconv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - have_gio=0 -elif test $pkg_failed = untried; then - have_gio=0 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dcgettext (); +int +main () +{ +return dcgettext (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dcgettext=yes else - GIO_CFLAGS=$pkg_cv_GIO_CFLAGS - GIO_LIBS=$pkg_cv_GIO_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - have_gio=1 + ac_cv_lib_intl_dcgettext=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 +$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv +else + : fi +else + : +fi -if test $have_gio = 1 ; then + fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_GIO 1 + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi +done -# --disable-deprecated switch for GTK2 purification -# Check whether --enable-deprecated was given. -if test "${enable_deprecated+set}" = set; then - enableval=$enable_deprecated; GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" -fi + LIBS="$glib_save_LIBS" + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -# Plugins support -# Check whether --enable-plugins was given. -if test "${enable_plugins+set}" = set; then - enableval=$enable_plugins; -else - enable_plugins=yes -fi + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi -if test "x$enable_plugins" = "xyes" ; then + if test "$gt_cv_have_gettext" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_PLUGINS 1 -_ACEOF +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h - if true; then - PLUGINS_TRUE= - PLUGINS_FALSE='#' + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; 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_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else - PLUGINS_TRUE='#' - PLUGINS_FALSE= + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" + ;; +esac fi - -else - if false; then - PLUGINS_TRUE= - PLUGINS_FALSE='#' +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - PLUGINS_TRUE='#' - PLUGINS_FALSE= -fi - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + for ac_func in dcgettext +do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +if test "x$ac_cv_func_dcgettext" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DCGETTEXT 1 +_ACEOF -# Use included GNU regex library -# Check whether --enable-gnu-regex was given. -if test "${enable_gnu_regex+set}" = set; then - enableval=$enable_gnu_regex; -else - enable_gnu_regex=no fi +done + MSGFMT_OPTS= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 +$as_echo_n "checking if msgfmt accepts -c... " >&6; } + cat >conftest.foo <<_ACEOF -if test "x$enable_gnu_regex" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define USE_INCLUDED_REGEX 1 -_ACEOF - +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" -cat >>confdefs.h <<\_ACEOF -#define HAVE_REGCOMP 1 _ACEOF - - if true; then - USE_INCLUDED_REGEX_TRUE= - USE_INCLUDED_REGEX_FALSE='#' -else - USE_INCLUDED_REGEX_TRUE='#' - USE_INCLUDED_REGEX_FALSE= +if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +echo "$as_me: failed input was:" >&5 +sed 's/^/| /' conftest.foo >&5 fi + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; 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_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else - if false; then - USE_INCLUDED_REGEX_TRUE= - USE_INCLUDED_REGEX_FALSE='#' -else - USE_INCLUDED_REGEX_TRUE='#' - USE_INCLUDED_REGEX_FALSE= + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac fi - +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -case "${host}" in - *mingw*) -{ $as_echo "$as_me:$LINENO: checking for fnmatch in -liberty" >&5 -$as_echo_n "checking for fnmatch in -liberty... " >&6; } -if test "${ac_cv_lib_iberty_fnmatch+set}" = set; then + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; 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_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liberty $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char fnmatch (); int main () { -return fnmatch (); +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_iberty_fnmatch=yes +if ac_fn_c_try_link "$LINENO"; then : + CATOBJEXT=.gmo + DATADIRNAME=share else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_iberty_fnmatch=no + case $host in + *-*-solaris*) + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + CATOBJEXT=.gmo + DATADIRNAME=share +else + CATOBJEXT=.mo + DATADIRNAME=lib fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iberty_fnmatch" >&5 -$as_echo "$ac_cv_lib_iberty_fnmatch" >&6; } -if test "x$ac_cv_lib_iberty_fnmatch" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBIBERTY 1 -_ACEOF - - LIBS="-liberty $LIBS" - -else - - { { $as_echo "$as_me:$LINENO: error: fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details." >&5 -$as_echo "$as_me: error: fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details." >&2;} - { (exit 1); exit 1; }; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi fi -cat >>confdefs.h <<_ACEOF -#define WIN32 1 -_ACEOF - - want_vte="no" - want_socket="yes" -cat >>confdefs.h <<\_ACEOF -#define HAVE_SOCKET 1 -_ACEOF + if test "$gt_cv_have_gettext" = "yes" ; then +$as_echo "#define ENABLE_NLS 1" >>confdefs.h - if true; then - MINGW_TRUE= - MINGW_FALSE='#' -else - MINGW_TRUE='#' - MINGW_FALSE= -fi + fi - ;; - *) - if false; then - MINGW_TRUE= - MINGW_FALSE='#' -else - MINGW_TRUE='#' - MINGW_FALSE= -fi + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi + fi - ;; -esac + # We need to process the po/ directory. + POSUB=po -if test "x$want_socket" = "x"; then - # socket support - # Check whether --enable-socket was given. -if test "${enable_socket+set}" = set; then - enableval=$enable_socket; want_socket="$enableval" -else - want_socket="yes" -fi + ac_config_commands="$ac_config_commands default-1" - if test "x$want_socket" = "xyes"; then + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -cat >>confdefs.h <<\_ACEOF -#define HAVE_SOCKET 1 -_ACEOF - # this should bring in libsocket on Solaris: - { $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 -$as_echo_n "checking for library containing connect... " >&6; } -if test "${ac_cv_search_connect+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char connect (); -int -main () -{ -return connect (); - ; - return 0; -} -_ACEOF -for ac_lib in '' socket; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_connect=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_connect+set}" = set; then - break -fi -done -if test "${ac_cv_search_connect+set}" = set; then - : -else - ac_cv_search_connect=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 -$as_echo "$ac_cv_search_connect" >&6; } -ac_res=$ac_cv_search_connect -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -fi - fi -fi -if test "x$want_vte" = "x"; then - # VTE support - # Check whether --enable-vte was given. -if test "${enable_vte+set}" = set; then - enableval=$enable_vte; want_vte="$enableval" -else - want_vte="yes" -fi - if test "x$want_vte" = "xyes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_VTE 1 -_ACEOF - fi -# Check whether --with-vte-module-path was given. -if test "${with_vte_module_path+set}" = set; then - withval=$with_vte_module_path; -cat >>confdefs.h <<_ACEOF -#define VTE_MODULE_PATH "$withval" -_ACEOF + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 +$as_echo_n "checking for catalogs to be installed... " >&6; } + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } + fi -fi + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -fi + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi -GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES -# 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)" +# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) +if test "x$MSGFMT" = "xno"; then + as_fn_error "msgfmt not found. Please install the gettext package." "$LINENO" 5 fi -# just for a laugh (it has absolutely no effect) -# Check whether --enable-the-force was given. -if test "${enable_the_force+set}" = set; then - enableval=$enable_the_force; be_luke="$enableval" -else - be_luke="no" +# 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 -{ $as_echo "$as_me:$LINENO: checking whether the force is with you" >&5 -$as_echo_n "checking whether the force is with you... " >&6; } -if test "x$be_luke" = "xyes"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +# Set ${docdir} if it is empty +if test -z "${docdir}"; then + docdir='${datadir}/doc/${PACKAGE}' -# i18n -GETTEXT_PACKAGE=geany +fi +GEANY_DATA_DIR=`eval echo ${datarootdir}/geany` -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF +# intltool hack to define install_sh on Debian/Ubuntu systems +if test "x$install_sh" = "x"; then + install_sh="`pwd`/install-sh" -ALL_LINGUAS="`sed -e '/^#/d' $srcdir/po/LINGUAS`" # take all languages found in file po/LINGUAS +fi +ac_config_files="$ac_config_files 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" +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. -for ac_header in locale.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_header_preproc=no -fi +DEFS=-DHAVE_CONFIG_H -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +LTLIBOBJS=$ac_ltlibobjs - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +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 fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -done + ac_config_commands="$ac_config_commands po/stamp-it" - if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -$as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -return LC_MESSAGES - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - am_cv_val_LC_MESSAGES=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - am_cv_val_LC_MESSAGES=no +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then + as_fn_error "conditional \"PLUGINS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then + as_fn_error "conditional \"PLUGINS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USE_INCLUDED_REGEX_TRUE}" && test -z "${USE_INCLUDED_REGEX_FALSE}"; then + as_fn_error "conditional \"USE_INCLUDED_REGEX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USE_INCLUDED_REGEX_TRUE}" && test -z "${USE_INCLUDED_REGEX_FALSE}"; then + as_fn_error "conditional \"USE_INCLUDED_REGEX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then + as_fn_error "conditional \"MINGW\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then + as_fn_error "conditional \"MINGW\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -$as_echo "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF - - fi - fi - USE_NLS=yes +: ${CONFIG_STATUS=./config.status} +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. - gt_cv_have_gettext=no +debug=false +ac_cs_recheck=false +ac_cs_silent=false - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## - if test "${ac_cv_header_libintl_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -$as_echo_n "checking for libintl.h... " >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -$as_echo "$ac_cv_header_libintl_h" >&6; } +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 -$as_echo_n "checking libintl.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 -$as_echo_n "checking libintl.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi - ac_header_preproc=no +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" - ;; +# Find who we are. Look in the path if we contain no directory separator. +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; esac -{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -$as_echo_n "checking for libintl.h... " >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -$as_echo "$ac_cv_header_libintl_h" >&6; } - +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -if test "x$ac_cv_header_libintl_h" = x""yes; then - gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - # - # First check in libc - # - { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -$as_echo_n "checking for ngettext in libc... " >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' -#include +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE -int -main () +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () { -return !ngettext ("","", 1) - ; - return 0; + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} } -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_func_ngettext_libc=yes +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append - gt_cv_func_ngettext_libc=no -fi +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -$as_echo "$gt_cv_func_ngettext_libc" >&6; } - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -$as_echo_n "checking for dgettext in libc... " >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then - $as_echo_n "(cached) " >&6 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include + as_basename=false +fi -int -main () -{ -return !dgettext ("","") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_func_dgettext_libc=yes +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` - gt_cv_func_dgettext_libc=no -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -#ifdef __STDC__ -# include -#else -# include -#endif +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -#undef $ac_func + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + test -d ./-p && rmdir ./-p + as_mkdir_p=false fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -done - - fi +as_executable_p=$as_test_x - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bindtextdomain (); -int -main () -{ -return bindtextdomain (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_intl_bindtextdomain=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_intl_bindtextdomain=no -fi +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# 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 -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_intl_ngettext=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ - ac_cv_lib_intl_ngettext=no -fi +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -$as_echo_n "checking for dgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dgettext (); -int -main () -{ -return dgettext (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_intl_dgettext=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_intl_dgettext=no -fi +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -$as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = x""yes; then - gt_cv_func_dgettext_libintl=yes -fi -fi +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -fi +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to the package provider." - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +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'`\\" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} +Copyright (C) 2009 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_intl_ngettext=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_intl_ngettext=no -fi +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -$as_echo_n "checking for dcgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dcgettext (); -int -main () +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log { -return dcgettext (); - ; - return 0; -} + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' +macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' +pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' +host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' +host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' +host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' +build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' +build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' +build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' +SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' +Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' +GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' +EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' +FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' +LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' +NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' +LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' +ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' +exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' +lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' +reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' +AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' +STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' +RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' +compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' +GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' +SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' +ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' +need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' +LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' +libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' +fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' +version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' +runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' +libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' +soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' +old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' +striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' +predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' +predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' +postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# Quote evaled strings. +for var in SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +AR \ +AR_FLAGS \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +SHELL \ +ECHO \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_wl \ +lt_prog_compiler_pic \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ +hardcode_libdir_separator \ +fix_srcfile_path \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +finish_eval \ +old_striplib \ +striplib \ +compiler_lib_search_dirs \ +predep_objects \ +postdep_objects \ +predeps \ +postdeps \ +compiler_lib_search_path \ +LD_CXX \ +compiler_CXX \ +lt_prog_compiler_no_builtin_flag_CXX \ +lt_prog_compiler_wl_CXX \ +lt_prog_compiler_pic_CXX \ +lt_prog_compiler_static_CXX \ +lt_cv_prog_compiler_c_o_CXX \ +export_dynamic_flag_spec_CXX \ +whole_archive_flag_spec_CXX \ +compiler_needs_object_CXX \ +with_gnu_ld_CXX \ +allow_undefined_flag_CXX \ +no_undefined_flag_CXX \ +hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_flag_spec_ld_CXX \ +hardcode_libdir_separator_CXX \ +fix_srcfile_path_CXX \ +exclude_expsyms_CXX \ +include_expsyms_CXX \ +file_list_spec_CXX \ +compiler_lib_search_dirs_CXX \ +predep_objects_CXX \ +postdep_objects_CXX \ +predeps_CXX \ +postdeps_CXX \ +compiler_lib_search_path_CXX; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +sys_lib_dlsearch_path_spec \ +old_archive_cmds_CXX \ +old_archive_from_new_cmds_CXX \ +old_archive_from_expsyms_cmds_CXX \ +archive_cmds_CXX \ +archive_expsym_cmds_CXX \ +module_cmds_CXX \ +module_expsym_cmds_CXX \ +export_symbols_cmds_CXX \ +prelink_cmds_CXX; do + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_intl_dcgettext=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_intl_dcgettext=no -fi +ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv -else - : +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi -else - : -fi - fi + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' + + + + + - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset -for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -#ifdef __STDC__ -# include -#else -# include -#endif +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;; + "icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES icons/16x16/Makefile" ;; + "icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES icons/48x48/Makefile" ;; + "icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/scalable/Makefile" ;; + "tagmanager/Makefile") CONFIG_FILES="$CONFIG_FILES tagmanager/Makefile" ;; + "tagmanager/include/Makefile") CONFIG_FILES="$CONFIG_FILES tagmanager/include/Makefile" ;; + "scintilla/Makefile") CONFIG_FILES="$CONFIG_FILES scintilla/Makefile" ;; + "scintilla/include/Makefile") CONFIG_FILES="$CONFIG_FILES scintilla/include/Makefile" ;; + "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "doc/geany.1") CONFIG_FILES="$CONFIG_FILES doc/geany.1" ;; + "geany.spec") CONFIG_FILES="$CONFIG_FILES geany.spec" ;; + "geany.pc") CONFIG_FILES="$CONFIG_FILES geany.pc" ;; + "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; -#undef $ac_func + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -int -main () +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || { -return $ac_func (); - ; - return 0; + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 } -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +# Create a (secure) tmp directory for tmp files. - eval "$as_ac_var=no" -fi +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF -fi -done - LIBS="$glib_save_LIBS" +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } - if test "$gt_cv_have_gettext" = "yes"; then + print line +} -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 +_ACAWK _ACEOF - - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" -for ac_func in dcgettext -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. -#ifdef __STDC__ -# include -#else -# include -#endif +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done -#undef $ac_func +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 -int -main () -{ -return $ac_func (); - ; - return 0; +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } } +{ print } +_ACAWK _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" - eval "$as_ac_var=no" -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift -fi -done + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done - MSGFMT_OPTS= - { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 -$as_echo_n "checking if msgfmt accepts -c... " >&6; } - cat >conftest.foo <<_ACEOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac -_ACEOF -if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 - ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -echo "$as_me: failed input was:" >&5 -sed 's/^/| /' conftest.foo >&5 -fi + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi + case $ac_mode in + :F) + # + # CONFIG_FILE + # - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q } +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - CATOBJEXT=.gmo - DATADIRNAME=share -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in - *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 - ac_cv_func_bind_textdomain_codeset=no -fi +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then - CATOBJEXT=.gmo - DATADIRNAME=share -else - CATOBJEXT=.mo - DATADIRNAME=lib -fi + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac -fi + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi -fi + 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" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + 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" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; + "libtool":C) + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" - if test "$gt_cv_have_gettext" = "yes" ; then + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - fi - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" - fi - fi +# The names of the tagged configurations supported by this script. +available_tags="CXX " - # We need to process the po/ directory. - POSUB=po +# ### BEGIN LIBTOOL CONFIG - ac_config_commands="$ac_config_commands default-1" +# Whether or not to build static libraries. +build_old_libs=$enable_static +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# What type of objects to build. +pic_mode=$pic_mode +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os +# A sed program that does not truncate output. +SED=$lt_SED +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" +# A grep program that handles long lines. +GREP=$lt_GREP +# An ERE matcher. +EGREP=$lt_EGREP +# A literal string matcher. +FGREP=$lt_FGREP +# A BSD- or MS-compatible name lister. +NM=$lt_NM +# Whether we need soft or hard links. +LN_S=$lt_LN_S +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len +# Object file suffix (normally "o"). +objext=$ac_objext - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -$as_echo_n "checking for catalogs to be installed... " >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - fi +# Executable file suffix (normally ""). +exeext=$exeext - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +# whether the shell understands "unset". +lt_unset=$lt_unset - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) -if test "x$MSGFMT" = "xno"; then - { { $as_echo "$as_me:$LINENO: error: msgfmt not found. Please install the gettext package." >&5 -$as_echo "$as_me: error: msgfmt not found. Please install the gettext package." >&2;} - { (exit 1); exit 1; }; } -fi +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method -# 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 +# Command to use when deplibs_check_method == "file_magic". +file_magic_cmd=$lt_file_magic_cmd -# Set ${docdir} if it is empty -if test -z "${docdir}"; then - docdir='${datadir}/doc/${PACKAGE}' +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -fi +# A symbol stripping program. +STRIP=$lt_STRIP -GEANY_PIXMAPS_DIR=`eval echo ${datarootdir}/pixmaps` +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -GEANY_DATA_DIR=`eval echo ${datarootdir}/geany` +# A C compiler. +LTCC=$lt_CC +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS -# intltool hack to define install_sh on Debian/Ubuntu systems -if test "x$install_sh" = "x"; then - install_sh="`pwd`/install-sh" +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -fi +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -ac_config_files="$ac_config_files Makefile icons/Makefile icons/16x16/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" +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -_ACEOF +# The name of the directory that contains temporary libtool files. +objdir=$objdir -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache +# An echo program that does not interpret backslashes. +ECHO=$lt_ECHO -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD -DEFS=-DHAVE_CONFIG_H +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL -LTLIBOBJS=$ac_ltlibobjs +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL - ac_config_commands="$ac_config_commands po/stamp-it" +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 +# Old archive suffix (normally "a"). +libext=$libext -if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"PLUGINS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"PLUGINS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"PLUGINS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"PLUGINS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${USE_INCLUDED_REGEX_TRUE}" && test -z "${USE_INCLUDED_REGEX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"USE_INCLUDED_REGEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"USE_INCLUDED_REGEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${USE_INCLUDED_REGEX_TRUE}" && test -z "${USE_INCLUDED_REGEX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"USE_INCLUDED_REGEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"USE_INCLUDED_REGEX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MINGW\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MINGW\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MINGW\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MINGW\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds -: ${CONFIG_STATUS=./config.status} -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac +# Do we need a version for libraries? +need_version=$need_version -fi +# Library versioning type. +version_type=$version_type +# Shared library runtime path variable. +runpath_var=$runpath_var +# Shared library path variable. +shlibpath_var=$shlibpath_var +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +# Format of library name prefix. +libname_spec=$lt_libname_spec -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE +# Run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -# CDPATH. -$as_unset CDPATH +# The linker used to build libraries. +LD=$lt_LD +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } +# A language specific compiler. +CC=$lt_compiler - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} +# Is the compiler the GNU compiler? +with_gcc=$GCC +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -exec 6>&1 +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag -_ACEOF +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct -_ACEOF +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L -Usage: $0 [OPTION]... [FILE]... +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic -Configuration files: -$config_files +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath -Configuration headers: -$config_headers +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs -Configuration commands: -$config_commands +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path -Report bugs to ." +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_version="\\ -config.status -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds -Copyright (C) 2008 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -AWK='$AWK' -test -n "\$AWK" || AWK=awk -_ACEOF +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec - # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - esac - shift -done +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects +postdep_objects=$lt_postdep_objects +predeps=$lt_predeps +postdeps=$lt_postdeps -ac_configure_extra_args= +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi +# ### END LIBTOOL CONFIG -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES fi +_LT_EOF + ;; + esac -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +ltmain="$ac_aux_dir/ltmain.sh" -_ACEOF + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;; - "icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES icons/16x16/Makefile" ;; - "tagmanager/Makefile") CONFIG_FILES="$CONFIG_FILES tagmanager/Makefile" ;; - "tagmanager/include/Makefile") CONFIG_FILES="$CONFIG_FILES tagmanager/include/Makefile" ;; - "scintilla/Makefile") CONFIG_FILES="$CONFIG_FILES scintilla/Makefile" ;; - "scintilla/include/Makefile") CONFIG_FILES="$CONFIG_FILES scintilla/include/Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; - "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/geany.1") CONFIG_FILES="$CONFIG_FILES doc/geany.1" ;; - "geany.spec") CONFIG_FILES="$CONFIG_FILES geany.spec" ;; - "geany.pc") CONFIG_FILES="$CONFIG_FILES geany.pc" ;; - "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; - "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} + +# func_xform libobj-or-source +func_xform () { - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + func_xform_result=${1%.*}.lo } -# Create a (secure) tmp directory for tmp files. +# func_arith arithmetic-term... +func_arith () { - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || + func_arith_result=$(( $* )) +} + +# func_len string +# STRING may not start with a hyphen. +func_len () { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || + func_len_result=${#1} +} + +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () { - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi } -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + esac +} -echo 'BEGIN {' >"$tmp/subs1.awk" && -_ACEOF +# sed scripts: +my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[^=]*=//' +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} +# func_lo2o object +func_lo2o () { - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` +} -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\).*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\).*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` } + +_LT_EOF +esac + +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () { - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } + eval "$1+=\$2" +} +_LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" - print line +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1=\$$1\$2" } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } -_ACEOF +_LT_EOF + ;; + esac -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then - break - elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done + cat <<_LT_EOF >> "$ofile" -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. +# ### BEGIN LIBTOOL TAG CONFIG: CXX -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 +# The linker used to build libraries. +LD=$lt_LD_CXX + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds_CXX + +# A language specific compiler. +CC=$lt_compiler_CXX + +# Is the compiler the GNU compiler? +with_gcc=$GCC_CXX + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } -fi # test -n "$CONFIG_HEADERS" +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" - done +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object_CXX - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; - esac - ;; - esac +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld_CXX +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX - case $ac_mode in - :F) - # - # CONFIG_FILE - # +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct_CXX + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute_CXX + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L_CXX -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic_CXX - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; - esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } - fi -# Compute "$ac_file"'s index in $config_headers. -_am_arg="$ac_file" -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath_CXX - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path_CXX + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_CXX + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_CXX + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds_CXX + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec_CXX + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_CXX + +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects_CXX +postdep_objects=$lt_postdep_objects_CXX +predeps=$lt_predeps_CXX +postdeps=$lt_postdeps_CXX + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + +# ### END LIBTOOL TAG CONFIG: CXX +_LT_EOF - 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" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - 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" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done ;; "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 -$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -26753,15 +19744,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -26782,10 +19770,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru /tmp/H5qKeNSrz8/geany-0.17/configure.in /tmp/ssBwSf4GIv/geany-0.18/configure.in --- geany-0.17/configure.in 2009-02-24 18:25:41.000000000 +0000 +++ geany-0.18/configure.in 2009-05-26 21:45:36.000000000 +0100 @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in 3594 2009-02-24 18:25:41Z eht16 $ +dnl $Id: configure.in 3816 2009-05-26 20:45:36Z eht16 $ AC_INIT(configure.in) -AM_INIT_AUTOMAKE(geany, 0.17) +AM_INIT_AUTOMAKE(geany, 0.18) AM_CONFIG_HEADER(config.h) @@ -259,8 +259,6 @@ AC_SUBST(docdir) fi -GEANY_PIXMAPS_DIR=`eval echo ${datarootdir}/pixmaps` -AC_SUBST(GEANY_PIXMAPS_DIR) GEANY_DATA_DIR=`eval echo ${datarootdir}/geany` AC_SUBST(GEANY_DATA_DIR) @@ -274,6 +272,8 @@ Makefile icons/Makefile icons/16x16/Makefile +icons/48x48/Makefile +icons/scalable/Makefile tagmanager/Makefile tagmanager/include/Makefile scintilla/Makefile diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetype_extensions.conf /tmp/ssBwSf4GIv/geany-0.18/data/filetype_extensions.conf --- geany-0.17/data/filetype_extensions.conf 2009-03-13 09:58:27.000000000 +0000 +++ geany-0.18/data/filetype_extensions.conf 2009-06-23 13:53:18.000000000 +0100 @@ -32,7 +32,7 @@ Python=*.py;*.pyw; R=*.R;*.r; Ruby=*.rb;*.rhtml;*.ruby; -Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash; +Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; Tcl=*.tcl;*.tk;*.wish; CSS=*.css; Docbook=*.docbook; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.actionscript /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.actionscript --- geany-0.17/data/filetypes.actionscript 2009-03-30 19:13:31.000000000 +0100 +++ geany-0.18/data/filetypes.actionscript 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.ada /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.ada --- geany-0.17/data/filetypes.ada 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/data/filetypes.ada 2009-08-09 11:10:23.000000000 +0100 @@ -0,0 +1,53 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x000000;0xffffff;false;false +word=0x00007f;0xffffff;true;false +identifier=0x000000;0xffffff;false;false +number=0x007f00;0xffffff;false;false +delimiter=0x301010;0xffffff;false;false +character=0xff901e;0xffffff;false;false +charactereol=0x000000;0xe0c0e0;false;false +string=0xff901e;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false +label=0xaaaaaa;0xffffff;false;true +commentline=0xd00000;0xffffff;false;false +illegal=0xff0000;0xffffff;false;true + +[keywords] +# all items must be in one line +primary=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 + + +[settings] +# default extension used when saving files +#extension=adb + +# 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= + + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=gcc -Wall -c "%f" +linker=gnatmake "%e" +run_cmd="./%e" + + diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.c /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.c --- geany-0.17/data/filetypes.c 2008-11-29 12:52:26.000000000 +0000 +++ geany-0.18/data/filetypes.c 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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 # 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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.common /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.common --- geany-0.17/data/filetypes.common 2008-12-04 18:12:09.000000000 +0000 +++ geany-0.18/data/filetypes.common 2009-07-16 16:54:45.000000000 +0100 @@ -1,7 +1,9 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic - used for filetype All/None -default=0x000000;0xffffff;false;false +# use foreground;background;bold;italic or named_style,bold,italic + +# used for filetype All/None +default=default # 3rd selection argument is true to override default foreground # 4th selection argument is true to override default background @@ -18,7 +20,7 @@ # 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=0x0;0xf0f0f0;true;false +current_line=0x000000;0xf0f0f0;true;false # 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: @@ -30,9 +32,14 @@ # only the first and second argument is interpreted marker_line=0x000000;0xffff00;false;false -# style for a highlighted search result (e.g when using "Mark" in Search dialogs) +# 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 + +# style for a marked line (e.g when using the "Toggle Marker" keybinding (Ctrl-M)) # only the first and second argument is interpreted -marker_search=0x000000;0xB8F4B8;false;false +marker_mark=0x000000;0xb8f4b8;false;false # translucency for the line marker(first argument) and the search marker (second argument) # only the first and second argument is interpreted @@ -40,14 +47,14 @@ # 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;0x0;false;false +caret=0x000000;0x000000;false;false # width of the caret(the blinking cursor), only first argument is interpreted # width in pixels, use 0 to make it invisible, maximum width is 3 caret_width=1;0;false;false # set foreground and background colour of indentation guides -indent_guide=0xc0c0c0;0xffffff;false;false +indent_guide=0xc0c0c0;;false;false # 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. @@ -76,11 +83,42 @@ # 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 -# sets the size of indentation of sublines for wrapped lines in terms of the width of a space, -# only first argument is interpreted -line_wrap_indent=0;0;false;false +# 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 +# one more indent level, possible values: +# 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 + +# 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 [settings] # which characters should be skipped when moving (or included when deleting) to word boundaries # should always include space and tab (\s\t) whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~ + +[named_styles] +# style names to use in filetypes.* [styling] sections +# use foreground;background;bold;italic +# normally background should be left blank to use the "default" style + +default=0x000000;0xffffff;false;false +comment=0xd00000 +commentdoc=0x3f5fbf +number=0x007f00 +# keyword +word=0x00007f;;true;false +# e.g. global types from a *.c.tags file +word2=0x991111;;true;false +string=0xff901e +preprocessor=0x007f7f +operator=0x301010 +# unterminated string +stringeol=0x000000;0xe0c0e0;false;false +type=0x0000d0;;true;false diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.cpp /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.cpp --- geany-0.17/data/filetypes.cpp 2008-03-17 17:13:56.000000000 +0000 +++ geany-0.18/data/filetypes.cpp 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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 # 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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.cs /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.cs --- geany-0.17/data/filetypes.cs 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.18/data/filetypes.cs 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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 # 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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.d /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.d --- geany-0.17/data/filetypes.d 2008-03-17 17:13:56.000000000 +0000 +++ geany-0.18/data/filetypes.d 2009-06-17 12:17:07.000000000 +0100 @@ -1,24 +1,24 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -commentdocnested=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -word3=0x991111;0xffffff;true;false -typedef=0x0000d0;0xffffff;true;false -string=0xff901e;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -character=0xff901e;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false +default=default +comment=comment +commentline=comment +commentdoc=commentdoc +commentdocnested=commentdoc +number=number +word=word +word2=word2 +word3=word2 +typedef=type +string=string +stringeol=stringeol +character=string +operator=operator +identifier=default +commentlinedoc=commentdoc,bold +commentdockeyword=commentdoc,bold,italic +commentdockeyworderror=commentdoc [keywords] # all items must be in one line diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.ferite /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.ferite --- geany-0.17/data/filetypes.ferite 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.18/data/filetypes.ferite 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.glsl /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.glsl --- geany-0.17/data/filetypes.glsl 2008-08-27 13:44:54.000000000 +0100 +++ geany-0.18/data/filetypes.glsl 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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 # 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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.haxe /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.haxe --- geany-0.17/data/filetypes.haxe 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.18/data/filetypes.haxe 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.java /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.java --- geany-0.17/data/filetypes.java 2007-11-01 16:33:06.000000000 +0000 +++ geany-0.18/data/filetypes.java 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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] 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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.javascript /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.javascript --- geany-0.17/data/filetypes.javascript 2008-04-24 15:17:11.000000000 +0100 +++ geany-0.18/data/filetypes.javascript 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -word2=0x991111;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -uuid=0x404080;0xffffff;false;false -preprocessor=0x007F7F;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -verbatim=0x101030;0xffffff;false;false -regex=0x105090;0xffffff;false;false -commentlinedoc=0x3f5fbf;0xffffff;true;false -commentdockeyword=0x3f5fbf;0xffffff;true;true -commentdockeyworderror=0x3f5fbf;0xffffff;false;false -globalclass=0x0000d0;0xffffff;true;false +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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.matlab /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.matlab --- geany-0.17/data/filetypes.matlab 2008-11-07 15:55:40.000000000 +0000 +++ geany-0.18/data/filetypes.matlab 2009-06-05 16:35:47.000000000 +0100 @@ -36,3 +36,10 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler= +run_cmd=octave -q "%f" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.pascal /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.pascal --- geany-0.17/data/filetypes.pascal 2007-11-01 16:33:06.000000000 +0000 +++ geany-0.18/data/filetypes.pascal 2009-05-03 19:13:34.000000000 +0100 @@ -1,21 +1,26 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x0000ff;0xffffff;false;false +default=0x000000;0xffffff;false;false +identifier=0x000000;0xffffff;false;false comment=0xd00000;0xffffff;false;false -number=0x007f00;0xffffff;false;false +comment2=0x3f5fbf;0xffffff;false;false +commentline=0xd00000;0xffffff;false;false +preprocessor=0x007f7f;0xffffff;false;false +preprocessor2=0x007f7f;0xffffff;false;false +number=0x007F00;0xffffff;false;false +hexnumber=0x007F00;0xffffff;false;false word=0x111199;0xffffff;true;false string=0xff901e;0xffffff;false;false +stringeol=0x000000;0xe0c0e0;false;false character=0x404000;0xffffff;false;false -preprocessor=0x007f7f;0xffffff;false;false operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -regex=0x1b6313;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false +asm=0x804080;0xffffff;false;false + [keywords] -primary=absolute and array asm begin break case const constructor continue destructor div do downto dynamic else end end. file for function goto if implementation in inherited inline interface label message mod nil not object of on operator or overload outpacked procedure program record reintroduce repeat self set shl shr string then to type unit until uses var while with xor as class except exports finalization finally initialization is library on property raise threadvar try dispose exit false new true absolute abstract alias assembler cdecl cppdecl default export external far far16 forward index name near oldfpccall override pascal private protected public published read register safecall softfloat stdcall virtual write +# 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 [settings] diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.tcl /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.tcl --- geany-0.17/data/filetypes.tcl 2009-01-06 17:13:45.000000000 +0000 +++ geany-0.18/data/filetypes.tcl 2009-07-04 10:44:20.000000000 +0100 @@ -21,13 +21,12 @@ [keywords] # all items must be in one line -tcl=after append apply array auto_execok auto_import auto_load auto_load_index auto_mkindex auto_mkindex_old auto_qualify auto_reset beep bgerror binary break case catch cd chan clock close concat continue dde default dict echo else elseif encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend lassign lindex linsert list llength load loadTk lrange lrepeat lreplace lreverse lsearch lset lsort mathfunc mathop memory msgcat namespace open package parray pid pkg::create pkg_mkIndex platform platform::shell Platform-specific proc puts pwd read refchan regexp registry regsub rename resource re_syntax return Safe Base scan seek set socket source split string subst switch Tcl tcl_endOfWord tcl_findLibrary tclLog tclMacPkgSearch tclPkgSetup tclPkgUnknown tcl_startOfNextWord tcl_startOfPreviousWord tcltest tclvars tcl_wordBreakAfter tcl_wordBreakBefore tell time tm trace unknown unload unset update uplevel upvar variable vwait while +tcl=after append apply array auto_execok auto_import auto_load auto_load_index auto_mkindex auto_mkindex_old auto_qualify auto_reset beep bgerror binary break case catch cd chan clock close concat continue coroutine dde default dict echo else elseif encoding eof error eval exec exit expr fblocked fconfigure fcopy file fileevent filename flush for foreach format gets glob global history http if incr info interp join lappend lassign lindex linsert list llength load loadTk lrange lrepeat lreplace lreverse lsearch lset lsort mathfunc mathop memory msgcat namespace oo::class oo::copy oo::define oo::objdefine oo::object open package parray pid pkg::create pkg_mkIndex platform platform::shell Platform-specific proc puts pwd read refchan regexp registry regsub rename resource re_syntax return Safe Base scan seek set socket source split string subst switch tailcall Tcl tcl::prefix tcl_endOfWord tcl_findLibrary tclLog tclMacPkgSearch tclPkgSetup tclPkgUnknown tcl_startOfNextWord tcl_startOfPreviousWord tcltest tclvars tcl_wordBreakAfter tcl_wordBreakBefore tell throw time tm trace try unknown unload unset update uplevel upvar variable vwait while yield zlib tk=bell bind bindtags bitmap button canvas checkbutton clipboard colors console cursors destroy entry event focus font frame grab grid image Inter-client keysyms label labelframe listbox loadTk lower menu menubutton message option options pack panedwindow photo place radiobutton raise scale scrollbar selection send spinbox text toplevel winfo wish wm itcl=@scope body class code common component configbody constructor define destructor hull import inherit itcl itk itk_component itk_initialize itk_interior itk_option iwidgets keep method private protected public -tkcommands=tk tk_bisque tkButtonAutoInvoke tkButtonDown tkButtonEnter tkButtonInvoke tkButtonLeave tkButtonUp tkCancelRepeat tkCheckRadioDown tkCheckRadioEnter tkCheckRadioInvoke tk_chooseColor tk_chooseDirectory tkColorDialog tkColorDialog_BuildDialog tkColorDialog_CancelCmd tkColorDialog_Config tkColorDialog_CreateSelector tkColorDialog_DrawColorScale tkColorDialog_EnterColorBar tkColorDialog_HandleRGBEntry tkColorDialog_HandleSelEntry tkColorDialog_InitValues tkColorDialog_LeaveColorBar tkColorDialog_MoveSelector tkColorDialog_OkCmd tkColorDialog_RedrawColorBars tkColorDialog_RedrawFinalColor tkColorDialog_ReleaseMouse tkColorDialog_ResizeColorBars tkColorDialog_RgbToX tkColorDialog_SetRGBValue tkColorDialog_StartMove tkColorDialog_XToRgb tkConsoleAbout tkConsoleBind tkConsoleExit tkConsoleHistory tkConsoleInit tkConsoleInsert tkConsoleInvoke tkConsoleOutput tkConsolePrompt tkConsoleSource tkDarken tk_dialog tkEntryAutoScan tkEntryBackspace tkEntryButton1 tkEntryClosestGap tkEntryGetSelection tkEntryInsert tkEntryKeySelect tkEntryMouseSelect tkEntryNextWord tkEntryPaste tkEntryPreviousWord tkEntrySeeInsert tkEntrySetCursor tkEntryTranspose tkerror tkEventMotifBindings tkFDGetFileTypes tkFirstMenu tk_focusFollowsMouse tkFocusGroup_BindIn tkFocusGroup_BindOut tkFocusGroup_Create tkFocusGroup_Destroy tkFocusGroup_In tkFocusGroup_Out tk_focusNext tkFocusOK tk_focusPrev tkGenerateMenuSelect tk_getOpenFile tk_getSaveFile tkIconList tkIconList_Add tkIconList_Arrange tkIconList_AutoScan tkIconList_Btn1 tkIconList_Config tkIconList_Create tkIconList_CtrlBtn1 tkIconList_Curselection tkIconList_DeleteAll tkIconList_Double1 tkIconList_DrawSelection tkIconList_FocusIn tkIconList_FocusOut tkIconList_Get tkIconList_Goto tkIconList_Index tkIconList_Invoke tkIconList_KeyPress tkIconList_Leave1 tkIconList_LeftRight tkIconList_Motion1 tkIconList_Reset tkIconList_ReturnKey tkIconList_See tkIconList_Select tkIconList_Selection tkIconList_ShiftBtn1 tkIconList_UpDown tkListbox tkListboxAutoScan tkListboxBeginExtend tkListboxBeginSelect tkListboxBeginToggle tkListboxCancel tkListboxDataExtend tkListboxExtendUpDown tkListboxKeyAccel_Goto tkListboxKeyAccel_Key tkListboxKeyAccel_Reset tkListboxKeyAccel_Set tkListboxKeyAccel_Unset tkListboxMotion tkListboxSelectAll tkListboxUpDown tkMbButtonUp tkMbEnter tkMbLeave tkMbMotion tkMbPost tkMenuButtonDown tkMenuDownArrow tkMenuDup tkMenuEscape tkMenuFind tkMenuFindName tkMenuFirstEntry tkMenuInvoke tkMenuLeave tkMenuLeftArrow tkMenuMotion tkMenuNextEntry tkMenuNextMenu tkMenuRightArrow tk_menuSetFocus tkMenuUnpost tkMenuUpArrow tk_messageBox tkMessageBox tkMotifFDialog tkMotifFDialog_ActivateDList tkMotifFDialog_ActivateFEnt tkMotifFDialog_ActivateFList tkMotifFDialog_ActivateSEnt tkMotifFDialog_BrowseDList tkMotifFDialog_BrowseFList tkMotifFDialog_BuildUI tkMotifFDialog_CancelCmd tkMotifFDialog_Config tkMotifFDialog_Create tkMotifFDialog_FileTypes tkMotifFDialog_FilterCmd tkMotifFDialog_InterpFilter tkMotifFDialog_LoadFiles tkMotifFDialog_MakeSList tkMotifFDialog_OkCmd tkMotifFDialog_SetFilter tkMotifFDialog_SetListMode tkMotifFDialog_Update tk_optionMenu tk_popup tkPostOverPoint tkRecolorTree tkRestoreOldGrab tkSaveGrabInfo tkScaleActivate tkScaleButton2Down tkScaleButtonDown tkScaleControlPress tkScaleDrag tkScaleEndDrag tkScaleIncrement tkScreenChanged tkScrollButton2Down tkScrollButtonDown tkScrollButtonDrag tkScrollButtonUp tkScrollByPages tkScrollByUnits tkScrollDrag tkScrollEndDrag tkScrollSelect tkScrollStartDrag tkScrollTopBottom tkScrollToPos tk_setPalette tkTabToWindow tkTearOffMenu tkTextAutoScan tkTextButton1 tkTextClosestGap tk_textCopy tk_textCut tkTextInsert tkTextKeyExtend tkTextKeySelect tkTextNextPara tkTextNextPos tkTextNextWord tk_textPaste tkTextPaste tkTextPrevPara tkTextPrevPos tkTextPrevWord tkTextResetAnchor tkTextScrollPages tkTextSelectTo tkTextSetCursor tkTextTranspose tkTextUpDownLine tkTraverseToMenu tkTraverseWithinMenu tkvars tkwait toplevel ttk::button ttk::checkbutton ttk::combobox ttk::entry ttk::frame ttk::image ttk::intro ttk::label ttk::labelframe ttk::menubutton ttk::notebook ttk::panedwindow ttk::progressbar ttk::radiobutton ttk::scale ttk::scrollbar ttk::separator ttk::sizegrip ttk::style ttk::treeview ttk::widget +tkcommands=tk tk_bisque tkButtonAutoInvoke tkButtonDown tkButtonEnter tkButtonInvoke tkButtonLeave tkButtonUp tkCancelRepeat tkCheckRadioDown tkCheckRadioEnter tkCheckRadioInvoke tk_chooseColor tk_chooseDirectory tkColorDialog tkColorDialog_BuildDialog tkColorDialog_CancelCmd tkColorDialog_Config tkColorDialog_CreateSelector tkColorDialog_DrawColorScale tkColorDialog_EnterColorBar tkColorDialog_HandleRGBEntry tkColorDialog_HandleSelEntry tkColorDialog_InitValues tkColorDialog_LeaveColorBar tkColorDialog_MoveSelector tkColorDialog_OkCmd tkColorDialog_RedrawColorBars tkColorDialog_RedrawFinalColor tkColorDialog_ReleaseMouse tkColorDialog_ResizeColorBars tkColorDialog_RgbToX tkColorDialog_SetRGBValue tkColorDialog_StartMove tkColorDialog_XToRgb tkConsoleAbout tkConsoleBind tkConsoleExit tkConsoleHistory tkConsoleInit tkConsoleInsert tkConsoleInvoke tkConsoleOutput tkConsolePrompt tkConsoleSource tkDarken tk_dialog tkEntryAutoScan tkEntryBackspace tkEntryButton1 tkEntryClosestGap tkEntryGetSelection tkEntryInsert tkEntryKeySelect tkEntryMouseSelect tkEntryNextWord tkEntryPaste tkEntryPreviousWord tkEntrySeeInsert tkEntrySetCursor tkEntryTranspose tkerror tkEventMotifBindings tkFDGetFileTypes tkFirstMenu tk_focusFollowsMouse tkFocusGroup_BindIn tkFocusGroup_BindOut tkFocusGroup_Create tkFocusGroup_Destroy tkFocusGroup_In tkFocusGroup_Out tk_focusNext tkFocusOK tk_focusPrev tkGenerateMenuSelect tk_getOpenFile tk_getSaveFile tkIconList tkIconList_Add tkIconList_Arrange tkIconList_AutoScan tkIconList_Btn1 tkIconList_Config tkIconList_Create tkIconList_CtrlBtn1 tkIconList_Curselection tkIconList_DeleteAll tkIconList_Double1 tkIconList_DrawSelection tkIconList_FocusIn tkIconList_FocusOut tkIconList_Get tkIconList_Goto tkIconList_Index tkIconList_Invoke tkIconList_KeyPress tkIconList_Leave1 tkIconList_LeftRight tkIconList_Motion1 tkIconList_Reset tkIconList_ReturnKey tkIconList_See tkIconList_Select tkIconList_Selection tkIconList_ShiftBtn1 tkIconList_UpDown tkListbox tkListboxAutoScan tkListboxBeginExtend tkListboxBeginSelect tkListboxBeginToggle tkListboxCancel tkListboxDataExtend tkListboxExtendUpDown tkListboxKeyAccel_Goto tkListboxKeyAccel_Key tkListboxKeyAccel_Reset tkListboxKeyAccel_Set tkListboxKeyAccel_Unset tkListboxMotion tkListboxSelectAll tkListboxUpDown tkMbButtonUp tkMbEnter tkMbLeave tkMbMotion tkMbPost tkMenuButtonDown tkMenuDownArrow tkMenuDup tkMenuEscape tkMenuFind tkMenuFindName tkMenuFirstEntry tkMenuInvoke tkMenuLeave tkMenuLeftArrow tkMenuMotion tkMenuNextEntry tkMenuNextMenu tkMenuRightArrow tk_menuSetFocus tkMenuUnpost tkMenuUpArrow tk_messageBox tkMessageBox tkMotifFDialog tkMotifFDialog_ActivateDList tkMotifFDialog_ActivateFEnt tkMotifFDialog_ActivateFList tkMotifFDialog_ActivateSEnt tkMotifFDialog_BrowseDList tkMotifFDialog_BrowseFList tkMotifFDialog_BuildUI tkMotifFDialog_CancelCmd tkMotifFDialog_Config tkMotifFDialog_Create tkMotifFDialog_FileTypes tkMotifFDialog_FilterCmd tkMotifFDialog_InterpFilter tkMotifFDialog_LoadFiles tkMotifFDialog_MakeSList tkMotifFDialog_OkCmd tkMotifFDialog_SetFilter tkMotifFDialog_SetListMode tkMotifFDialog_Update tk_optionMenu tk_popup tkPostOverPoint tkRecolorTree tkRestoreOldGrab tkSaveGrabInfo tkScaleActivate tkScaleButton2Down tkScaleButtonDown tkScaleControlPress tkScaleDrag tkScaleEndDrag tkScaleIncrement tkScreenChanged tkScrollButton2Down tkScrollButtonDown tkScrollButtonDrag tkScrollButtonUp tkScrollByPages tkScrollByUnits tkScrollDrag tkScrollEndDrag tkScrollSelect tkScrollStartDrag tkScrollTopBottom tkScrollToPos tk_setPalette tkTabToWindow tkTearOffMenu tkTextAutoScan tkTextButton1 tkTextClosestGap tk_textCopy tk_textCut tkTextInsert tkTextKeyExtend tkTextKeySelect tkTextNextPara tkTextNextPos tkTextNextWord tk_textPaste tkTextPaste tkTextPrevPara tkTextPrevPos tkTextPrevWord tkTextResetAnchor tkTextScrollPages tkTextSelectTo tkTextSetCursor tkTextTranspose tkTextUpDownLine tkTraverseToMenu tkTraverseWithinMenu tkvars tkwait toplevel ttk::button ttk::checkbutton ttk::combobox ttk::entry ttk::frame ttk::image ttk::intro ttk::label ttk::labelframe ttk::menubutton ttk::notebook ttk::panedwindow ttk::progressbar ttk::radiobutton ttk::scale ttk::scrollbar ttk::separator ttk::sizegrip ttk::spinbox ttk::style ttk::treeview ttk::widget ttk_vsapi expand= - [settings] # default extension used when saving files #extension=tcl @@ -50,9 +49,6 @@ # context action command (please see Geany's main documentation for details) context_action_cmd= -# context action command (please see Geany's main documentation for details) -context_action_cmd= - [build_settings] # %f will be replaced by the complete filename diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.vala /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.vala --- geany-0.17/data/filetypes.vala 2009-01-12 17:20:43.000000000 +0000 +++ geany-0.18/data/filetypes.vala 2009-06-17 12:17:07.000000000 +0100 @@ -1,26 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -#default=0x000000;0xffffff;false;false -#comment=0xd00000;0xffffff;false;false -#commentline=0xd00000;0xffffff;false;false -#commentdoc=0x3f5fbf;0xffffff;false;false -#number=0x007f00;0xffffff;false;false -#word=0x00007f;0xffffff;true;false -#word2=0x991111;0xffffff;true;false -#string=0xff901e;0xffffff;false;false -#character=0xff901e;0xffffff;false;false -#uuid=0x404080;0xffffff;false;false -#preprocessor=0x007F7F;0xffffff;false;false -#operator=0x301010;0xffffff;false;false -#identifier=0x000000;0xffffff;false;false -#stringeol=0x000000;0xe0c0e0;false;false -#verbatim=0x101030;0xffffff;false;false -#regex=0x105090;0xffffff;false;false -#commentlinedoc=0x3f5fbf;0xffffff;true;false -#commentdockeyword=0x3f5fbf;0xffffff;true;true -#commentdockeyworderror=0x3f5fbf;0xffffff;false;false -#globalclass=0x0000d0;0xffffff;true;false +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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/filetypes.xml /tmp/ssBwSf4GIv/geany-0.18/data/filetypes.xml --- geany-0.17/data/filetypes.xml 2008-09-10 12:28:33.000000000 +0100 +++ geany-0.18/data/filetypes.xml 2009-06-17 20:04:17.000000000 +0100 @@ -66,6 +66,7 @@ # same as operators jscript_symbols=0x301010;0xffffff;false;false jscript_stringeol=0x000000;0xe0c0e0;false;false +jscript_regex=0x105090;0xffffff;false;false # for embedded Python script (), Python styles from # filetypes.python are used diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/latex.tags /tmp/ssBwSf4GIv/geany-0.18/data/latex.tags --- geany-0.17/data/latex.tags 2009-01-14 16:08:00.000000000 +0000 +++ geany-0.18/data/latex.tags 2009-05-13 18:11:41.000000000 +0100 @@ -241,8 +241,10 @@ \cvcomputer||{param1}{param2}{param3}{param4}| \cventry||{param1}{param2}{param3}{param4}{param5}{param6}| \cvitem||{param1}{param2}| -\cvline||{param1}{param2}| \cvlanguage||{param1}{param2}{param3}| +\cvlistitem||{param1}| +\cvlistitemsymbol||| +\cvline||{param1}{param2}| \dagger||| \danger||| \dash||| @@ -811,6 +813,7 @@ \newtoks||| \newwrite||| \ni||| +\nicefrac||[value]{numerator}{denominator}| \noalign||| \nocite||{keylist}| \nocorr||| @@ -1265,6 +1268,8 @@ \underline||{text}| \unhbox||| \unhcopy||| +\unit||[value]{dimension}| +\unitfrac||[value]{numerator}{denominator}| \unitlength||| \unkern||| \unlhd||| diff -Nru /tmp/H5qKeNSrz8/geany-0.17/data/ui_toolbar.xml /tmp/ssBwSf4GIv/geany-0.18/data/ui_toolbar.xml --- geany-0.17/data/ui_toolbar.xml 2008-12-09 20:30:23.000000000 +0000 +++ geany-0.18/data/ui_toolbar.xml 2009-06-25 18:21:45.000000000 +0100 @@ -1,12 +1,15 @@ Load Tags*. +tags files") upon startup, or manually using *Tools --> Load Tags*. Geany uses its own tag file format, similar to what ``ctags`` uses (but is incompatible with ctags). You use Geany to generate global @@ -1230,7 +1276,7 @@ Tags for each document are parsed whenever a file is loaded or saved. These are shown in the Symbol list in the Sidebar. These tags -are also used for auto completion of symbols and calltips for all documents +are also used for autocompletion of symbols and calltips for all documents open in the current session that have the same filetype. The *Go to Tag* commands can be used with all workspace tags. See @@ -1240,7 +1286,7 @@ Global tags ^^^^^^^^^^^ -Global tags are used to provide auto completion of symbols and calltips +Global tags are used to provide autocompletion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade the library. @@ -1250,6 +1296,9 @@ * Using the *Load Tags* command in the Tools menu. * By creating a directory ``~/.config/geany/tags``, and moving or symlinking the tags files there before starting Geany. +* By creating a directory ``$prefix/share/geany/tags``, and moving + or symlinking the tags files there before starting Geany. + ``$prefix`` is the installation prefix (see `Installation prefix`_). You can either download these files or generate your own. They have the format:: @@ -1483,7 +1532,7 @@ Remove all messages from the status bar. The messages are still displayed in the status messages window. -Auto focus widgets (focus follows mouse) +Auto-focus widgets (focus follows mouse) Give the focus automatically to widgets below the mouse cursor. This works for the main editor widget, the scribble, the toolbar search field goto line fields and the VTE. @@ -1761,19 +1810,28 @@ on the next line with the correct indentation based on the previous line, as long as the multi-line is not closed by ``*/``. -Automatic symbol completion +Autocomplete symbols When you start to type a symbol name, look for the full string to allow it to be completed for you. -Characters to type for completion - Number of characters of a word to type before auto completion is +Autocomplete all words in document + When you start to type a word, Geany will search the whole document for + words starting with the typed part to complete it, assuming there + are no tag names to show. + +Drop rest of word on completion + Remove any word part to the right of the cursor when choosing a + completion list item. + +Characters to type for autocompletion + Number of characters of a word to type before autocompletion is displayed. -Rows of symbol completion list - The maximum number of symbols to show in the auto completion window. +Completion list height + The number of rows to display for the autocompletion window. Max. symbol name suggestions - The maximum number of entries to display in the auto completion list. + The maximum number of items in the autocompletion list. Auto-close quotes and brackets @@ -2432,8 +2490,7 @@ ``-p``, which prevents plugins being loaded. Plugins are scanned in the following directories: -* ``$prefix/lib/geany`` (``$prefix`` is usually ``/usr/local`` or - ``/usr``) +* ``$prefix/lib/geany`` (see `Installation prefix`_) * ``~/.config/geany/plugins`` Most plugins add menu items to the *Tools* menu when they are loaded. @@ -2525,6 +2582,10 @@ Delete current line(s) Ctrl-K Deletes the current line (and any lines with a selection). + +Delete to line end Ctrl-Shift-Delete Deletes from the current caret position to the + end of the current line. + Duplicate line or selection Ctrl-D Duplicates the current line or selection. Transpose current line Ctrl-T Transposes the current line with the previous one. @@ -2537,10 +2598,14 @@ Scroll down by one line Alt-Down Scrolls the view. -Complete word Ctrl-Space Shows auto completion list. +Complete word Ctrl-Space Shows the autocompletion list. If already showing + tag completion, it shows document word completion + instead, even if it is not enabled for automatic + completion. Likewise if no tag suggestions are + available, it shows document word completion. -Show calltip Alt-Space (Unix) Shows call tips for the current function or - Alt-Shift-Space (Windows) method. +Show calltip Ctrl-Shift-Space Shows call tips for the current function or + method. Show macro list Ctrl-Return Shows a list of available macros and variables in the workspace. @@ -2645,6 +2710,9 @@ line (if there is no selection) to the embedded Terminal (VTE). +Reflow lines/paragraph Reformat selected lines or current paragraph, + breaking lines at the long line marker. + **Settings** @@ -2720,6 +2788,13 @@ Go to End of Line End Move the caret to the end of the line. +Go to End of Display Line Alt-End Move the caret to the end of the display line. + This is useful when you use line wrapping and + want to jump to the end of the wrapped, virtual + line, not the real end of the whole line. + If the line is not wrapped, it behaves like + `Go to End of Line`, see above. + Go to Previous Word Part Ctrl-/ Goto the previous part of the current word. Go to Next Word Part Ctrl-\ Goto the next part of the current word. @@ -2762,7 +2837,13 @@ Switch to right document Ctrl-PageDown Switches to the next open document. -Switch to last used document Ctrl-Tab Switches to the previously selected open document. +Switch to last used document Ctrl-Tab Switches to the previously shown document (if it's + still open). + Holding Ctrl (or another modifier if the keybinding + has been changed) will show a dialog, then repeated + presses of the keybinding will switch to the 2nd-last + used document, 3rd-last, etc. Also known as + Most-Recently-Used documents switching. Move document left Alt-PageUp Changes the current document with the left hand one. @@ -2845,10 +2926,10 @@ The global configuration file is read from ``$prefix/share/geany/geany.conf`` (where ``$prefix`` is the path where -Geany is installed) when starting Geany and an user configuration -file does not exist. It can contain any settings which are found in -the usual configuration file created by Geany but does not have to -contain all settings. +Geany is installed, see `Installation prefix`_) when starting Geany and +an user configuration file does not exist. It can contain any settings +which are found in the usual configuration file created by Geany but +does not have to contain all settings. .. note:: This feature is mainly intended for package maintainers or system @@ -2868,13 +2949,15 @@ The system-wide configuration files can be found in ``$prefix/share/geany`` and are called ``filetypes.$ext``, -where ``$prefix`` is the path where Geany is installed (commonly -``/usr/local``) and $ext is the name of the filetype. For every +where ``$prefix`` is the path where Geany is installed (see +`Installation prefix`_) and $ext is the name of the filetype. For every filetype there is a corresponding definition file. There is one exception: ``filetypes.common`` -- this file is for general settings, -which are not specific to a certain filetype. It is not recommended -to edit the system-wide files, because they will be overridden when -Geany is updated. +which are not specific to a certain filetype. + +.. warning:: + It is not recommended for users to edit the system-wide files, + because they will be overridden when Geany is updated. To change the settings, copy a file from ``$prefix/share/geany`` to the subdirectory filedefs in your configuration directory (usually @@ -2900,7 +2983,9 @@ ````````````````` In this section the colors for syntax highlighting are defined. The -format is always: key=foreground_color;background_color;bold;italic +manual format is: + +* ``key=foreground_color;background_color;bold_flag;italic_flag`` Colors have to be specified as RGB hex values prefixed by 0x. For example red is 0xff0000, blue is 0x0000ff. The values are @@ -2908,6 +2993,34 @@ and italic are flags and should only be "true" or "false". If their value is something other than "true" or "false", "false" is assumed. +You can omit fields to use the ``"default"`` named style. + +E.g. ``key=0xff0000;;true`` + +This makes the key style have red foreground text, default background +color text and bold emphasis. + +Using a named style +******************* +The second format uses a *named style* name to reference a style +defined in filetypes.common. + +* ``key=named_style`` +* ``key2=named_style2,bold,italic`` + +The bold and italic parts are optional, and if present are used to +toggle the bold or italic flags to the opposite of the named style's +flags. In contrast to style definition booleans, they are a literal +",bold,italic" and commas are used instead of semi-colons. + +E.g. ``key=comment,italic`` + +This makes the key style match the ``"comment"`` named style, but with +italic emphasis. + +To define named styles, see the filetypes.common `[named_styles] +Section`_. + [keywords] Section `````````````````` @@ -3050,6 +3163,38 @@ filetypes.common. This file defines some general non-filetype-specific settings. +See the `Format`_ section for how to define styles. + + +[named_styles] Section +`````````````````````` +Named styles declared here can be used in the [styling] section of any +filetypes.* file. + +For example: + +*In filetypes.common*:: + + [named_styles] + foo=0xc00000;0xffffff;false;true + bar=foo + +*In filetypes.c*:: + + [styling] + comment=foo + +This saves copying and pasting the whole style definition into several +different files. + +.. note:: + You can define aliases for named styles, as shown with the ``bar`` + entry in the above example, but they must be declared after the + original style. + + +[styling] Section +````````````````` default This is the default style. It is used for styling files without a filetype set. @@ -3179,12 +3324,19 @@ *Example:* ``line_wrap_visuals=3;0;false;false`` line_wrap_indent - Sets the size of indentation of sublines for wrapped lines in terms - of the width of a space. + 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``. - Only first argument is interpreted. + Second argument: wrapped sublines can be indented to the position of their + first subline or one more indent level. Possible values: + + * 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 + + Only first and second argument is interpreted. - *Example:* ``line_wrap_indent=0;0;false;false`` + *Example:* ``line_wrap_indent=0;1;false;false`` translucency Translucency for the current line (first argument) and the selection @@ -3207,13 +3359,21 @@ *Example:* ``marker_line=0x000000;0xffff00;false;false`` marker_search - The style for a highlighted search result (e.g when using "Mark" in - Search dialogs). The foreground color (first argument) is only used + The 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. + + *Example:* ``marker_search=0x000000;0xb8f4b8;false;false`` + +marker_mark + The style for a marked line (e.g when using the "Toggle Marker" keybinding + (Ctrl-M)). The foreground color (first argument) is only used when the Markers margin is enabled (see View menu). Only the first and second argument is interpreted. - *Example:* ``marker_search=0x000000;0xB8F4B8;false;false`` + *Example:* ``marker_mark=0x000000;0xb8f4b8;false;false`` marker_translucency Translucency for the line marker (first argument) and the search marker @@ -3226,6 +3386,18 @@ *Example:* ``marker_translucency=256;256;false;false`` +line_height + Amount of space to be drawn above and below the line's baseline. + The first argument defines the amount of space to be drawn above the line, the second + argument defines the amount of space to be drawn below. + + Only the first and second argument is interpreted. + + *Example:* ``line_height=0;0;false;false`` + + +[settings] Section +`````````````````` whitespace_chars Characters to treat as whitespace. These characters are ignored when moving, selecting and deleting across word boundaries @@ -3249,7 +3421,7 @@ To override the system-wide configuration file, copy it from ``$prefix/share/geany`` to your configuration directory, usually ``~/.config/geany/``. ``$prefix`` is the path where Geany is installed -(commonly ``/usr/local``). +(see `Installation prefix`_). For example:: @@ -3438,13 +3610,19 @@ Customizing the toolbar ----------------------- -You can add, remove and reorder the elements in the toolbar by editing -the file ``ui_toolbar.xml``. +You can add, remove and reorder the elements in the toolbar by using the toolbar editor +by manually editing the file ``ui_toolbar.xml``. + +The toolbar editor can be opened from the preferences editor on the Toolbar tab or +by right-clicking on the toolbar itself and choosing it from the menu. + +Manually editing of the toolbar layout +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ To override the system-wide configuration file, copy it from ``$prefix/share/geany`` to your configuration directory, usually ``~/.config/geany/``. ``$prefix`` is the path where Geany is installed -(commonly ``/usr/local``). +(see `Installation prefix`_). For example:: @@ -3456,11 +3634,11 @@ This file must be valid XML, otherwise the global toolbar UI definition will be used instead. +Your changes are applied once you save the file. + .. note:: (1) You cannot add new actions which are not listed below. (2) Everything you add or change must be inside the /ui/toolbar/ path. - (3) After you finish editing the file, you need to restart Geany - for changes to take effect. Available toolbar elements @@ -3495,6 +3673,7 @@ ZoomOut Zoom out the text UnIndent Decrease indentation Indent Increase indentation +Replace Replace text in the current document SearchEntry The search field belonging to the 'Search' element (can be used alone) Search Find the entered text in the current file (only useful if you also use 'SearchEntry') @@ -3600,14 +3779,12 @@ Delete to start of word. Ctrl+BackSpace Delete to end of word. Ctrl+Delete Delete to start of line. Ctrl+Shift+BackSpace -Delete to end of line. Ctrl+Shift+Delete Go to start of document. Ctrl+Home Extend selection to start of document. Ctrl+Shift+Home Go to start of display line. Alt+Home Extend selection to start of display line. Alt+Shift+Home Go to end of document. Ctrl+End Extend selection to end of document. Ctrl+Shift+End -Go to end of display line. Alt+End Extend selection to end of display line. Alt+Shift+End Previous paragraph. Shift extends selection. Ctrl+Up Next paragraph. Shift extends selection. Ctrl+Down @@ -3796,7 +3973,7 @@ Option Description Default ============================== ============================================ ================== GEANY_MIN_SYMBOLLIST_CHARS How many characters you need to type to 4 - trigger the auto completion list. + trigger the autocompletion list. GEANY_DISK_CHECK_TIMEOUT Time in seconds between checking a file for 30 external changes. GEANY_DEFAULT_TOOLS_MAKE The make tool. This can also include a path. "make" @@ -3816,7 +3993,7 @@ GEANY_DEFAULT_FONT_EDITOR The font used in the editor window. "Monospace 10" GEANY_TOGGLE_MARK A string which is used to mark a toggled "~ " comment. -GEANY_MAX_AUTOCOMPLETE_WORDS How many auto completion suggestions should 30 +GEANY_MAX_AUTOCOMPLETE_WORDS How many autocompletion suggestions should 30 Geany provide. ============================== ============================================ ================== Binary files /tmp/H5qKeNSrz8/geany-0.17/doc/images/pref_dialog_edit_completions.png and /tmp/ssBwSf4GIv/geany-0.18/doc/images/pref_dialog_edit_completions.png differ Binary files /tmp/H5qKeNSrz8/geany-0.17/doc/images/pref_dialog_toolbar.png and /tmp/ssBwSf4GIv/geany-0.18/doc/images/pref_dialog_toolbar.png differ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/doc/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/doc/Makefile.in --- geany-0.17/doc/Makefile.in 2009-05-02 18:50:12.000000000 +0100 +++ geany-0.18/doc/Makefile.in 2009-08-16 18:29:20.000000000 +0100 @@ -72,16 +72,14 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GEANY_DATA_DIR = @GEANY_DATA_DIR@ -GEANY_PIXMAPS_DIR = @GEANY_PIXMAPS_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -101,10 +99,12 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -113,13 +113,18 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -141,7 +146,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -172,6 +177,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/doc/plugins.dox /tmp/ssBwSf4GIv/geany-0.18/doc/plugins.dox --- geany-0.17/doc/plugins.dox 2009-02-14 17:37:28.000000000 +0000 +++ geany-0.18/doc/plugins.dox 2009-08-09 21:31:03.000000000 +0100 @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: plugins.dox 3581 2009-02-14 17:37:28Z eht16 $ + * $Id: plugins.dox 4063 2009-08-09 20:31:03Z eht16 $ * * This file contains additional plugin documentation like the signal system and a small howto. * It is best viewed when filetype is set to C or C++. @@ -32,19 +32,20 @@ * @mainpage Geany Plugin API Documentation * * @author Enrico Tröger, Nick Treleaven, Frank Lanitz - * @date $Date: 2009-02-14 18:37:28 +0100 (Sat, 14 Feb 2009) $ + * @date $Date: 2009-08-09 22:31:03 +0200 (Sun, 09 Aug 2009) $ * * @section Intro * This is the Geany API documentation. It is far from being complete and should be * considered as a work in progress. - * We will try to %document as many functions and structs as possible. + * We will try to document as many functions and structs as possible. * * To get started, see the @link howto Plugin Howto @endlink. * * Other pages: - * - @link plugindata.h Main Datatypes and Macros @endlink * - @link pluginsymbols.c Plugin Symbols @endlink + * - @link plugindata.h Main Datatypes and Macros @endlink * - @link signals Plugin Signals @endlink + * - @link pluginutils.c Plugin Utility Functions @endlink * - @link guidelines Plugin Writing Guidelines @endlink * * @note Some of these pages are also listed in Related Pages. @@ -56,10 +57,13 @@ * * @section Usage * - * To use plugin signals in Geany, you simply create a PluginCallback array, list the signals - * you want to listen to and create the appropiate signal callbacks for each signal. - * The callback array is read @a after plugin_init() has been called. - * @note The PluginCallback array has to be ended with a final NULL entry. + * To use plugin signals in Geany, you have two options: + * + * -# Create a PluginCallback array with the @ref plugin_callbacks symbol. List the signals + * you want to listen to and create the appropiate signal callbacks for each signal. + * The callback array is read @a after plugin_init() has been called. + * -# Use plugin_signal_connect(), which can be called at any time and can also connect + * to non-Geany signals (such as GTK widget signals). * * The following code demonstrates how to use signals in Geany plugins. The code can be inserted * in your plugin code at any desired position. @@ -76,6 +80,7 @@ { NULL, NULL, FALSE, NULL } }; * @endcode + * @note The PluginCallback array has to be ended with a final @c NULL entry. * * @section Signals * @@ -84,7 +89,7 @@ * void user_function(GObject *obj, GeanyDocument *doc, gpointer user_data); * @endsignalproto * @signaldesc - * Sent when a new %document is created. + * Sent when a new document is created. * * You need to include "document.h" for the declaration of GeanyDocument. * @@ -98,7 +103,7 @@ * void user_function(GObject *obj, GeanyDocument *doc, gpointer user_data); * @endsignalproto * @signaldesc - * Sent when a new %document is opened. + * Sent when a new document is opened. * * You need to include "document.h" for the declaration of GeanyDocument. * @@ -112,7 +117,7 @@ * void user_function(GObject *obj, GeanyDocument *doc, gpointer user_data); * @endsignalproto * @signaldesc - * Sent when a new %document is saved. + * Sent when a new document is saved. * * You need to include "document.h" for the declaration of GeanyDocument. * @@ -328,7 +333,7 @@ * @section intro Introduction * * Since Geany 0.12 there is a plugin interface to extend Geany's functionality and - * add new features. This %document gives a brief overview about how to add new + * add new features. This document gives a brief overview about how to add new * plugins by writing a simple "Hello World" plugin in C. * * @@ -365,22 +370,15 @@ * * Let's start with the very basic headers and add more later if necessary. * @code -#include "geany.h" -#include "plugindata.h" -#include "geanyfunctions.h" +#include "geanyplugin.h" * @endcode * - * @a geany.h will include the necessary GTK header files, so there is no need to include - * @a gtk/gtk.h yourself. + * @a geanyplugin.h includes all of the Geany API and also the necessary GTK header files, + * so there is no need to include @a gtk/gtk.h yourself. * + * @note * @a plugindata.h contains the biggest part of the plugin API and provides some basic macros. - * - * @a geanyfunctions.h provide some macros for convenient access to the plugin API. - * - * Later, you will note that by adding more functionality more header file includes will be - * necessary. Best practice for including header files is to always include @a geany.h at first, - * then include other necessary header files and at last include plugindata.h and @a - * geanyfunctions.h. + * @a geanyfunctions.h provides some macros for convenient access to plugin API functions. * * The you should define three basic variables which will give access to data fields and * functions provided by the plugin API. @@ -400,14 +398,14 @@ * Nevertheless when setting this value, you should choose the lowest possible version here to * make the plugin compatible with a bigger number of versions of Geany. * - * As the next step, you will need to tell Geany a couple of basic information of your plugin, - * so it is able to show them e.g. on the plugin manager dialog. + * For the next step, you will need to tell Geany some basic information about your plugin + * which will be shown in the plugin manager dialog. * * For doing this, you should use PLUGIN_SET_INFO() which expects 4 values: - * - Plugin name that should appear on the plugin manager dialog - * - Short plugin description - * - Plugin version - * - Author. + * - Plugin name + * - Short description + * - Version + * - Author * * Based on this, the line could look like: * @code @@ -421,7 +419,7 @@ * need to implement the function that is called when your plugin is unloaded. * These functions are called plugin_init() and plugin_cleanup(). Let's see how it could look like: * @code -PLUGIN_VERSION_CHECK(130) +PLUGIN_VERSION_CHECK(147) PLUGIN_SET_INFO("HelloWorld", "Just another tool to say hello world", "1.0", "Joe Doe "); @@ -435,15 +433,15 @@ } * @endcode * - * If you think this plugin seems to doesn't implement any function right now and only waste - * some memory, you are right. At least, it should compile and load/unload on in Geany nicely. + * If you think this plugin seems not to implement any functionality right now and only wastes + * some memory, you are right. But it should compile and load/unload in Geany nicely. * Now you have the very basic layout of a new plugin. Great, isn't it? * * Let's go on and implement some real functionality. * * As mentioned before, plugin_init() will be called when the plugin is loaded in Geany. - * So it should implement everything that needs to be done during startup. In this example case, - * we like to add a menu item to Geany's Tools menu which runs a dialog printing "Hello World". + * So it should implement everything that needs to be done during startup. In this case, + * we'd like to add a menu item to Geany's Tools menu which runs a dialog printing "Hello World". * @code void plugin_init(GeanyData *data) { @@ -467,15 +465,11 @@ * This will add an item to the Tools menu and connect this item to a function which implements * what should be done when the menu item is activated by the user. * This is done by g_signal_connect(). The Tools menu can be accessed with - * geany->main_widgets->tools_menu. The structure @a main_widgets contains pointers to some - * main GUI elements in Geany. To be able to use it, you must include ui_utils.h. This can - * be done by adding the following line to the include section of your code. - * @code -#include "ui_utils.h" - * @endcode + * geany->main_widgets->tools_menu. The structure @a main_widgets contains pointers to the + * main GUI elements in Geany. * - * Geany is offering a simple API for showing message dialogs. So the function contains - * only a few lines like: + * Geany has a simple API for showing message dialogs. So our function contains + * only a few lines: * @code void item_activate_cb(GtkMenuItem *menuitem, gpointer user_data) { @@ -485,8 +479,7 @@ * * For the moment you don't need to worry about the parameters of that function. * - * Do you remember, you need to clean up when unloading the plugin? Because of this, - * some more action is required. + * Now we need to clean up properly when the plugin is unloaded. * * To remove the menu item from the Tools menu, you can use gtk_widget_destroy(). * gtk_widget_destroy() expects a pointer to a GtkWidget object. @@ -513,22 +506,19 @@ } * @endcode * - * This will ensure, your menu item will be removed from the Tools menu as well as from - * memory once your plugin is unloaded and you don't leave any memory leaks back. + * This will ensure your menu item is removed from the Tools menu as well as from + * memory once your plugin is unloaded, so you don't leave any memory leaks. * Once this is done, your first plugin is ready. Congratulations! * * The complete listing (without comments): * @code -#include "geany.h" -#include "ui_utils.h" -#include "plugindata.h" -#include "geanyfunctions.h" +#include "geanyplugin.h" GeanyPlugin *geany_plugin; GeanyData *geany_data; GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(130) +PLUGIN_VERSION_CHECK(147) PLUGIN_SET_INFO("HelloWorld", "Just another tool to say hello world", "1.0", "John Doe "); @@ -557,4 +547,7 @@ } * @endcode * + * + * Now you might like to look at Geany's source code for core plugins such as + * @a plugins/demoplugin.c. **/ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/doc/pluginsymbols.c /tmp/ssBwSf4GIv/geany-0.18/doc/pluginsymbols.c --- geany-0.17/doc/pluginsymbols.c 2009-01-28 19:30:18.000000000 +0000 +++ geany-0.18/doc/pluginsymbols.c 2009-07-29 18:40:20.000000000 +0100 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: pluginsymbols.c 3524 2009-01-28 19:30:18Z eht16 $ + * $Id: pluginsymbols.c 4041 2009-07-29 17:40:20Z ntrel $ */ /* Note: this file is for Doxygen only. */ @@ -66,7 +66,8 @@ PluginFields *plugin_fields; /** An array for connecting GeanyObject events, which should be terminated with - * @c {NULL, NULL, FALSE, NULL}. See @link signals Signal documentation @endlink. */ + * @c {NULL, NULL, FALSE, NULL}. See @link signals Signal documentation @endlink. + * @see plugin_signal_connect(). */ PluginCallback plugin_callbacks[]; /** Most plugins should use the PLUGIN_KEY_GROUP() macro to define it. However, diff -Nru /tmp/H5qKeNSrz8/geany-0.17/geany.glade /tmp/ssBwSf4GIv/geany-0.18/geany.glade --- geany-0.17/geany.glade 2009-04-06 17:01:15.000000000 +0100 +++ geany-0.18/geany.glade 2009-07-14 12:25:07.000000000 +0100 @@ -415,10 +415,10 @@ - + True - Select _All - True + gtk-select-all + True @@ -2096,7 +2096,7 @@ True Images _and Text True - True + False @@ -2106,7 +2106,7 @@ True _Images Only True - True + False images_and_text2 @@ -2134,7 +2134,7 @@ True _Large Icons True - True + False @@ -2144,7 +2144,7 @@ True _Small Icons True - True + False large_icons1 @@ -2155,7 +2155,7 @@ True _Very Small Icons True - False + True large_icons1 @@ -2168,14 +2168,35 @@ + + True + _Customize Toolbar + True + + + + + True + gtk-properties + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + True - _Hide toolbar + _Hide Toolbar True - + True gtk-cancel 1 @@ -2259,10 +2280,10 @@ - + True - Select _All - True + gtk-select-all + True @@ -3430,7 +3451,7 @@ True 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. True - Auto focus widgets (focus follows mouse) + Auto-focus widgets (focus follows mouse) True GTK_RELIEF_NORMAL True @@ -4944,6 +4965,98 @@ False + + + + True + True + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-properties + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Customize Toolbar + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + 0 + False + False + + False @@ -5832,7 +5945,7 @@ True Automatic completion and closing of XML tags (includes HTML tags) True - XML tag auto completion + XML tag autocompletion True GTK_RELIEF_NORMAL True @@ -5872,7 +5985,45 @@ True Automatic completion of known symbols in open files (function names, global variables, ...) True - Automatic symbol completion + Autocomplete symbols + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Autocomplete all words in document + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Drop rest of word on completion True GTK_RELIEF_NORMAL True @@ -5955,7 +6106,7 @@ True - Characters to type for completion: + Characters to type for autocompletion: False False GTK_JUSTIFY_LEFT @@ -5983,7 +6134,7 @@ True - The amount of characters which are necessary to show the symbol auto completion list + The amount of characters which are necessary to show the symbol autocompletion list True 1 0 @@ -6005,7 +6156,7 @@ True - Display height in rows for the auto completion list + Display height in rows for the autocompletion list True 1 0 @@ -6027,7 +6178,7 @@ True - Maximum number of entries to display in the auto completion list + Maximum number of entries to display in the autocompletion list True 1 0 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/geany_private.rc /tmp/ssBwSf4GIv/geany-0.18/geany_private.rc --- geany-0.17/geany_private.rc 2009-02-15 14:10:10.000000000 +0000 +++ geany-0.18/geany_private.rc 2009-05-26 21:45:36.000000000 +0100 @@ -2,11 +2,11 @@ #include // include for version info constants -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico" +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" 1 VERSIONINFO -FILEVERSION 0,17,0,0 -PRODUCTVERSION 0,17,0,0 +FILEVERSION 0,18,0,0 +PRODUCTVERSION 0,18,0,0 FILETYPE VFT_APP { BLOCK "StringFileInfo" @@ -14,14 +14,14 @@ BLOCK "040704E4" { VALUE "CompanyName", "" - VALUE "FileVersion", "0.17" + VALUE "FileVersion", "0.18" VALUE "FileDescription", "Geany" VALUE "InternalName", "geany" VALUE "LegalCopyright", "Copyright 2005-2009 by the Geany developers" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "geany" VALUE "ProductName", "geany" - VALUE "ProductVersion", "0.17" + VALUE "ProductVersion", "0.18" } } } diff -Nru /tmp/H5qKeNSrz8/geany-0.17/geany.spec /tmp/ssBwSf4GIv/geany-0.18/geany.spec --- geany-0.17/geany.spec 2009-05-02 18:50:27.000000000 +0100 +++ geany-0.18/geany.spec 2009-08-16 18:29:35.000000000 +0100 @@ -1,6 +1,6 @@ Summary: A fast and lightweight IDE using GTK2 Name: geany -Version: 0.17 +Version: 0.18 Release: 1 License: GPL2 Group: Development/Tools @@ -62,9 +62,11 @@ %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/48x48/%{name}.png %{_datadir}/doc/%{name}/ %{_mandir}/man1/%{name}.1.gz -%{_datadir}/icons/hicolor/16x16/apps/classviewer-*.png +%{_datadir}/icons/hicolor/16x16/apps/*.png +%{_datadir}/icons/hicolor/48x48/apps/*.png +%{_datadir}/icons/hicolor/scalable/apps/*.svg %{_includedir}/%{name}/ %{_libdir}/pkgconfig/ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/geany.spec.in /tmp/ssBwSf4GIv/geany-0.18/geany.spec.in --- geany-0.17/geany.spec.in 2009-03-27 16:42:57.000000000 +0000 +++ geany-0.18/geany.spec.in 2009-05-30 14:48:33.000000000 +0100 @@ -62,9 +62,11 @@ %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/48x48/%{name}.png %{_datadir}/doc/%{name}/ %{_mandir}/man1/%{name}.1.gz -%{_datadir}/icons/hicolor/16x16/apps/classviewer-*.png +%{_datadir}/icons/hicolor/16x16/apps/*.png +%{_datadir}/icons/hicolor/48x48/apps/*.png +%{_datadir}/icons/hicolor/scalable/apps/*.svg %{_includedir}/%{name}/ %{_libdir}/pkgconfig/ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/HACKING /tmp/ssBwSf4GIv/geany-0.18/HACKING --- geany-0.17/HACKING 2009-01-30 18:10:27.000000000 +0000 +++ geany-0.18/HACKING 2009-07-30 11:55:23.000000000 +0100 @@ -207,6 +207,7 @@ filetypes.* configuration file ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ All languages need a data/filetypes.foo configuration file. See +the "Filetype definition files" section in the manual and/or data/filetypes.c for an example. Programming languages should have: @@ -235,16 +236,22 @@ 1. Write styleset_foo_init() to setup default styles and load style settings from the filetypes.foo configuration file. You should probably start by copying and adapting another filetype's initialization, such - as styleset_asm_init(). + as styleset_tcl_init(). Another way is to use load_style_entries() + to make style initialization simpler - see styleset_c_like_init(). + +.. note:: + Please try to make your styles fit in with the other filetypes' default + colors, and to use named styles where possible. Filetypes that share a + lexer should have the same colors. Normally, styles should leave the + background color empty to match the default color. + 2. Write styleset_foo() to apply styles when a new scintilla widget - is created. Again you could copy and adapt a function like styleset_asm(). + is created. Again you could copy and adapt a function like + styleset_tcl(). 3. In highlighting_init_styles(), add - ``init_styleset_case(GEANY_FILETYPES_FOO, foo);``. + ``init_styleset_case(GEANY_FILETYPES_FOO, styleset_foo_init);``. 4. In highlighting_set_styles(), add - ``styleset_case(GEANY_FILETYPES_FOO, foo);``. - -Please try to make your styles fit in with the other filetypes' default -colors. + ``styleset_case(GEANY_FILETYPES_FOO, styleset_foo);``. Error message parsing ^^^^^^^^^^^^^^^^^^^^^ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/16x16/classviewer-method.xpm /tmp/ssBwSf4GIv/geany-0.18/icons/16x16/classviewer-method.xpm --- geany-0.17/icons/16x16/classviewer-method.xpm 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/icons/16x16/classviewer-method.xpm 2009-07-08 15:51:25.000000000 +0100 @@ -0,0 +1,27 @@ +/* XPM */ +static char *classviewer_method[] = { +/* columns rows colors chars-per-pixel */ +"16 16 5 1", +" c black", +". c #E0BC38", +"X c #F0DC5C", +"o c #FCFC80", +"O c None", +/* pixels */ +"OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO", +"OOOOOOOOOO OOOO", +"OOOOOOOOO oo OO", +"OOOOOOOO ooooo O", +"OOOOOOO ooooo. O", +"OOOO O XXoo.. O", +"OOO oo XXX... O", +"OO ooooo XX.. OO", +"O ooooo. X. OOO", +"O XXoo.. O OOOO", +"O XXX... OOOOOOO", +"O XXX.. OOOOOOOO", +"OO X. OOOOOOOOO", +"OOOO OOOOOOOOOO" +}; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/16x16/classviewer-var.xpm /tmp/ssBwSf4GIv/geany-0.18/icons/16x16/classviewer-var.xpm --- geany-0.17/icons/16x16/classviewer-var.xpm 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/icons/16x16/classviewer-var.xpm 2009-07-08 15:51:25.000000000 +0100 @@ -0,0 +1,27 @@ +/* XPM */ +static char *classviewer_var[] = { +/* columns rows colors chars-per-pixel */ +"16 16 5 1", +" c black", +". c #8C748C", +"X c #9C94A4", +"o c #ACB4C0", +"O c None", +/* pixels */ +"OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO", +"OOOOOOOOOOOOOOOO", +"OOOOOOOOO OOOOO", +"OOOOOOOO oo OOO", +"OOOOOOO ooooo OO", +"OOOOOO ooooo. OO", +"OOOOOO XXoo.. OO", +"OOOOOO XXX... OO", +"OOOOOO XXX.. OOO", +"OOOOOOO X. OOOO", +"OOOOOOOOO OOOOO", +"OOOOOOOOOOOOOOOO" +}; Binary files /tmp/H5qKeNSrz8/geany-0.17/icons/16x16/geany.png and /tmp/ssBwSf4GIv/geany-0.18/icons/16x16/geany.png differ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/16x16/Makefile.am /tmp/ssBwSf4GIv/geany-0.18/icons/16x16/Makefile.am --- geany-0.17/icons/16x16/Makefile.am 2007-07-20 17:33:16.000000000 +0100 +++ geany-0.18/icons/16x16/Makefile.am 2009-07-08 15:51:25.000000000 +0100 @@ -1,5 +1,6 @@ iconsdir = $(datadir)/icons/hicolor/16x16/apps -icons_DATA = \ + +icons_DATA = \ classviewer-class.png \ classviewer-macro.png \ classviewer-member.png \ @@ -7,7 +8,9 @@ classviewer-namespace.png \ classviewer-other.png \ classviewer-struct.png \ - classviewer-var.png - -EXTRA_DIST = \ - $(icons_DATA) + classviewer-var.png \ + geany.png + +EXTRA_DIST = $(icons_DATA) \ + classviewer-var.xpm \ + classviewer-method.xpm diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/16x16/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/icons/16x16/Makefile.in --- geany-0.17/icons/16x16/Makefile.in 2009-05-02 18:50:13.000000000 +0100 +++ geany-0.18/icons/16x16/Makefile.in 2009-08-16 18:29:20.000000000 +0100 @@ -77,16 +77,14 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GEANY_DATA_DIR = @GEANY_DATA_DIR@ -GEANY_PIXMAPS_DIR = @GEANY_PIXMAPS_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -106,10 +104,12 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -118,13 +118,18 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -146,7 +151,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -177,6 +182,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -201,10 +207,12 @@ classviewer-namespace.png \ classviewer-other.png \ classviewer-struct.png \ - classviewer-var.png + classviewer-var.png \ + geany.png -EXTRA_DIST = \ - $(icons_DATA) +EXTRA_DIST = $(icons_DATA) \ + classviewer-var.xpm \ + classviewer-method.xpm all: all-am Binary files /tmp/H5qKeNSrz8/geany-0.17/icons/48x48/geany.png and /tmp/ssBwSf4GIv/geany-0.18/icons/48x48/geany.png differ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/48x48/Makefile.am /tmp/ssBwSf4GIv/geany-0.18/icons/48x48/Makefile.am --- geany-0.17/icons/48x48/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/icons/48x48/Makefile.am 2009-05-26 21:45:36.000000000 +0100 @@ -0,0 +1,4 @@ +iconsdir = $(datadir)/icons/hicolor/48x48/apps +icons_DATA = geany.png + +EXTRA_DIST = $(icons_DATA) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/48x48/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/icons/48x48/Makefile.in --- geany-0.17/icons/48x48/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/icons/48x48/Makefile.in 2009-08-16 18:29:20.000000000 +0100 @@ -0,0 +1,393 @@ +# Makefile.in generated by automake 1.10.2 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. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = icons/48x48 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +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 = +SOURCES = +DIST_SOURCES = +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__installdirs = "$(DESTDIR)$(iconsdir)" +iconsDATA_INSTALL = $(INSTALL_DATA) +DATA = $(icons_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANY_DATA_DIR = @GEANY_DATA_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +iconsdir = $(datadir)/icons/hicolor/48x48/apps +icons_DATA = geany.png +EXTRA_DIST = $(icons_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/48x48/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu icons/48x48/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) + test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" + @list='$(icons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \ + $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \ + done + +uninstall-iconsDATA: + @$(NORMAL_UNINSTALL) + @list='$(icons_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(iconsdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-iconsDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-iconsDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-iconsDATA install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-iconsDATA + +# 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 /tmp/H5qKeNSrz8/geany-0.17/icons/Makefile.am /tmp/ssBwSf4GIv/geany-0.18/icons/Makefile.am --- geany-0.17/icons/Makefile.am 2007-07-24 10:24:14.000000000 +0100 +++ geany-0.18/icons/Makefile.am 2009-05-26 21:45:36.000000000 +0100 @@ -1,5 +1,4 @@ -SUBDIRS = \ - 16x16 +SUBDIRS = 16x16 48x48 scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/icons/Makefile.in --- geany-0.17/icons/Makefile.in 2009-05-02 18:50:13.000000000 +0100 +++ geany-0.18/icons/Makefile.in 2009-08-16 18:29:20.000000000 +0100 @@ -79,16 +79,14 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GEANY_DATA_DIR = @GEANY_DATA_DIR@ -GEANY_PIXMAPS_DIR = @GEANY_PIXMAPS_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -108,10 +106,12 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -120,13 +120,18 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -148,7 +153,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -179,6 +184,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -194,9 +200,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = \ - 16x16 - +SUBDIRS = 16x16 48x48 scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor all: all-recursive diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/scalable/geany.svg /tmp/ssBwSf4GIv/geany-0.18/icons/scalable/geany.svg --- geany-0.17/icons/scalable/geany.svg 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/icons/scalable/geany.svg 2009-05-26 21:45:36.000000000 +0100 @@ -0,0 +1,661 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + geany + 29-06-07 + + + Sebastian Kraft + + + + + application + geany + editor + programming + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/scalable/Makefile.am /tmp/ssBwSf4GIv/geany-0.18/icons/scalable/Makefile.am --- geany-0.17/icons/scalable/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/icons/scalable/Makefile.am 2009-05-26 21:45:36.000000000 +0100 @@ -0,0 +1,4 @@ +iconsdir = $(datadir)/icons/hicolor/scalable/apps +icons_DATA = geany.svg + +EXTRA_DIST = $(icons_DATA) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/icons/scalable/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/icons/scalable/Makefile.in --- geany-0.17/icons/scalable/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/icons/scalable/Makefile.in 2009-08-16 18:29:20.000000000 +0100 @@ -0,0 +1,393 @@ +# Makefile.in generated by automake 1.10.2 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. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = icons/scalable +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +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 = +SOURCES = +DIST_SOURCES = +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__installdirs = "$(DESTDIR)$(iconsdir)" +iconsDATA_INSTALL = $(INSTALL_DATA) +DATA = $(icons_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GEANY_DATA_DIR = @GEANY_DATA_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +iconsdir = $(datadir)/icons/hicolor/scalable/apps +icons_DATA = geany.svg +EXTRA_DIST = $(icons_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/scalable/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu icons/scalable/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) + test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" + @list='$(icons_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \ + $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \ + done + +uninstall-iconsDATA: + @$(NORMAL_UNINSTALL) + @list='$(icons_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(iconsdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-iconsDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-iconsDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-iconsDATA install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-iconsDATA + +# 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 /tmp/H5qKeNSrz8/geany-0.17/ltmain.sh /tmp/ssBwSf4GIv/geany-0.18/ltmain.sh --- geany-0.17/ltmain.sh 2008-04-29 21:21:21.000000000 +0100 +++ geany-0.18/ltmain.sh 2009-08-16 18:29:11.000000000 +0100 @@ -1,52 +1,83 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008 Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify +# Generated from ltmain.m4sh. + +# ltmain.sh (GNU libtool) 2.2.6 +# Written by Gordon Matzigkeit , 1996 + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, but +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -basename="s,^.*/,,g" - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - -# The name of this program: -progname=`echo "$progpath" | $SED $basename` -modename="$progname" +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 +# Usage: $progname [OPTION]... [MODE-ARG]... +# +# Provide generalized library-building support services. +# +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print informational messages (default) +# --version print version information +# -h, --help print short or long help message +# +# MODE must be one of the following: +# +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory +# +# MODE-ARGS vary depending on the MODE. +# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +# +# When reporting a bug, please describe a test case to reproduce it and +# include the following information: +# +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 +# automake: $automake_version +# autoconf: $autoconf_version +# +# Report bugs to . PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.26 Debian 1.5.26-4" -TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" +VERSION="2.2.6 Debian-2.2.6a-4" +TIMESTAMP="" +package_revision=1.3012 -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -60,104 +91,261 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi +dirname="s,/[^/]*$,," +basename="s,^.*/,," -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -duplicate_deps=no -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} + +# Generated shell functions inserted here. + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# The name of this program: +# In the unlikely event $progname began with a '-', it would play havoc with +# func_echo (imagine progname=-n), so we prepend ./ in that case: +func_dirname_and_basename "$progpath" +progname=$func_basename_result +case $progname in + -*) progname=./$progname ;; +esac + +# Make sure we have an absolute path for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=$func_dirname_result + progdir=`cd "$progdir" && pwd` + progpath="$progdir/$progname" + ;; + *) + save_IFS="$IFS" + IFS=: + for progdir in $PATH; do + IFS="$save_IFS" + test -x "$progdir/$progname" && break + done + IFS="$save_IFS" + test -n "$progdir" || progdir=`pwd` + progpath="$progdir/$progname" + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed="${SED}"' -e 1s/^X//' +sed_quote_subst='s/\([`"$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Re-`\' parameter expansions in output of double_quote_subst that were +# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +# in input to double_quote_subst, that '$' was protected from expansion. +# Since each input `\' is now two `\'s, look for any number of runs of +# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +bs='\\' +bs2='\\\\' +bs4='\\\\\\\\' +dollar='\$' +sed_double_backslash="\ + s/$bs4/&\\ +/g + s/^$bs2$dollar/$bs&/ + s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g + s/\n//g" + +# Standard options: +opt_dry_run=false +opt_help=false +opt_quiet=false +opt_verbose=false +opt_warning=: + +# func_echo arg... +# Echo program name prefixed message, along with the current mode +# name if it has been set yet. +func_echo () +{ + $ECHO "$progname${mode+: }$mode: $*" +} + +# func_verbose arg... +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $opt_verbose && func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + +# func_error arg... +# Echo program name prefixed message to standard error. +func_error () +{ + $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 +} + +# func_warning arg... +# Echo program name prefixed warning message to standard error. +func_warning () +{ + $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + + # bash bug again: + : +} + +# func_fatal_error arg... +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + +# func_fatal_help arg... +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + func_error ${1+"$@"} + func_fatal_error "$help" +} +help="Try \`$progname --help' for more information." ## default + + +# func_grep expression filename +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_mkdir_p directory-path +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + my_directory_path="$1" + my_dir_list= + + if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + + # Protect directory names starting with `-' + case $my_directory_path in + -*) my_directory_path="./$my_directory_path" ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$my_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + my_dir_list="$my_directory_path:$my_dir_list" + + # If the last portion added has no slash in it, the list is done + case $my_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + done + my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + + save_mkdir_p_IFS="$IFS"; IFS=':' + for my_dir in $my_dir_list; do + IFS="$save_mkdir_p_IFS" + # mkdir can fail with a `File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$my_dir" 2>/dev/null || : + done + IFS="$save_mkdir_p_IFS" + + # Bail out if we (or some other process) failed to create a directory. + test -d "$my_directory_path" || \ + func_fatal_error "Failed to create \`$1'" + fi +} -##################################### -# Shell function definitions: -# This seems to be the best place for them # func_mktempdir [string] # Make a temporary directory that won't clash with other running @@ -167,7 +355,7 @@ { my_template="${TMPDIR-/tmp}/${1-$progname}" - if test "$run" = ":"; then + if test "$opt_dry_run" = ":"; then # Return a directory name, but don't create it in dry-run mode my_tmpdir="${my_template}-$$" else @@ -176,526 +364,787 @@ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" - save_mktempdir_umask=`umask` - umask 0077 - $mkdir "$my_tmpdir" - umask $save_mktempdir_umask + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask fi # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } + test -d "$my_tmpdir" || \ + func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $echo "X$my_tmpdir" | $Xsed + $ECHO "X$my_tmpdir" | $Xsed } -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () +# func_quote_for_eval arg +# Aesthetically quote ARG to be evaled later. +# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +# is double-quoted, suitable for a subsequent eval, whereas +# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +# which are still active within double quotes backslashified. +func_quote_for_eval () { - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; + case $1 in + *[\\\`\"\$]*) + func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + *) + func_quote_for_eval_unquoted_result="$1" ;; + esac + + case $func_quote_for_eval_unquoted_result in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and and variable + # expansion for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" + ;; + *) + func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" esac - ;; - esac - $echo $win32_libid_type } -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () +# func_quote_for_expand arg +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () { - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. + case $1 in + *[\\\`\"]*) + my_arg=`$ECHO "X$1" | $Xsed \ + -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case "$@ " in - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit $EXIT_FAILURE -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi + my_arg="$1" ;; + esac + + case $my_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + my_arg="\"$my_arg\"" + ;; + esac + + func_quote_for_expand_result="$my_arg" } -# func_extract_an_archive dir oldlib -func_extract_an_archive () +# func_show_eval cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () { - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" + my_cmd="$1" + my_fail_exp="${2-:}" - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + if ${opt_dry_run-false}; then :; else + eval "$my_cmd" + my_status=$? + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi fi } -# func_extract_archives gentop oldlib ... -func_extract_archives () + +# func_show_eval_locale cmd [fail_exp] +# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () { - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status + if ${opt_dry_run-false}; then :; else + eval "$lt_user_locale + $my_cmd" + my_status=$? + eval "$lt_safe_locale" + if test "$my_status" -eq 0; then :; else + eval "(exit $my_status); $my_fail_exp" + fi fi +} - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - extracted_serial=`expr $extracted_serial + 1` - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" + + + +# func_version +# Echo version message to standard output and exit. +func_version () +{ + $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + s/^# // + s/^# *$// + s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ + p + }' < "$progpath" + exit $? +} + +# func_usage +# Echo short help message to standard output and exit. +func_usage () +{ + $SED -n '/^# Usage:/,/# -h/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ + p + }' < "$progpath" + $ECHO + $ECHO "run \`$progname --help | more' for full usage" + exit $? +} + +# func_help +# Echo long help message to standard output and exit. +func_help () +{ + $SED -n '/^# Usage:/,/# Report bugs to/ { + s/^# // + s/^# *$// + s*\$progname*'$progname'* + s*\$host*'"$host"'* + s*\$SHELL*'"$SHELL"'* + s*\$LTCC*'"$LTCC"'* + s*\$LTCFLAGS*'"$LTCFLAGS"'* + s*\$LD*'"$LD"'* + s/\$with_gnu_ld/'"$with_gnu_ld"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + p + }' < "$progpath" + exit $? +} + +# func_missing_arg argname +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + func_error "missing argument for $1" + exit_cmd=exit } -# End of Shell function definitions -##################################### -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" +exit_cmd=: -disable_libs=no -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" + + + +# Check that we have a working $ECHO. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell, and then maybe $ECHO will work. + exec $SHELL "$progpath" --no-reexec ${1+"$@"} +fi - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat <&2 - exit $EXIT_FAILURE - ;; - esac +magic="%%%MAGIC variable%%%" +magic_exe="%%%MAGIC EXE variable%%%" - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac +# Global variables. +# $mode is unset +nonopt= +execute_dlfiles= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 - prev= - prevopt= - continue - fi +opt_dry_run=false +opt_duplicate_deps=false +opt_silent=false +opt_debug=: - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= - --version) - echo "\ -$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP - -Copyright (C) 2008 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." - exit $? - ;; +# func_fatal_configuration arg... +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func_error ${1+"$@"} + func_error "See the $PACKAGE documentation for more information." + func_fatal_error "Fatal configuration error." +} + + +# func_config +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath # Now print the configurations for the tags. for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" done - exit $? - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - --dry-run | -n) - run=: - ;; + exit $? +} - --features) - $echo "host: $host" +# func_features +# Display the features supported by this script. +func_features () +{ + $ECHO "host: $host" if test "$build_libtool_libs" = yes; then - $echo "enable shared libraries" + $ECHO "enable shared libraries" else - $echo "disable shared libraries" + $ECHO "disable shared libraries" fi if test "$build_old_libs" = yes; then - $echo "enable static libraries" + $ECHO "enable static libraries" else - $echo "disable static libraries" + $ECHO "disable static libraries" fi + exit $? - ;; +} - --finish) mode="finish" ;; +# func_enable_tag tagname +# Verify that TAGNAME is valid, and either flag an error and exit, or +# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +# variable here. +func_enable_tag () +{ + # Global variable: + tagname="$1" + + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf="/$re_begincf/,/$re_endcf/p" + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; + *) + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - --preserve-dup-deps) duplicate_deps="yes" ;; + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; +# Parse options once, thoroughly. This comes as soon as possible in +# the script to make things like `libtool --version' happen quickly. +{ - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift ;; - - *) - nonopt="$arg" - break + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift ;; esac -done -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi + # Parse non-mode specific arguments: + while test "$#" -gt 0; do + opt="$1" + shift -case $disable_libs in -no) - ;; -shared) - build_libtool_libs=no - build_old_libs=yes - ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - ;; -esac + case $opt in + --config) func_config ;; -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= + --debug) preserve_args="$preserve_args $opt" + func_echo "enabling shell trace mode" + opt_debug='set -x' + $opt_debug + ;; -if test -z "$show_help"; then + -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break + execute_dlfiles="$execute_dlfiles $1" + shift + ;; - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall + --dry-run | -n) opt_dry_run=: ;; + --features) func_features ;; + --finish) mode="finish" ;; + + --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break + case $1 in + # Valid mode arguments: + clean) ;; + compile) ;; + execute) ;; + finish) ;; + install) ;; + link) ;; + relink) ;; + uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; + esac + + mode="$1" + shift + ;; + + --preserve-dup-deps) + opt_duplicate_deps=: ;; + + --quiet|--silent) preserve_args="$preserve_args $opt" + opt_silent=: + ;; + + --verbose| -v) preserve_args="$preserve_args $opt" + opt_silent=false + ;; + + --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break + preserve_args="$preserve_args $opt $1" + func_enable_tag "$1" # tagname is set here + shift + ;; + + # Separate optargs to long options: + -dlopen=*|--mode=*|--tag=*) + func_opt_split "$opt" + set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + shift + ;; + + -\?|-h) func_usage ;; + --help) opt_help=: ;; + --version) func_version ;; + + -*) func_fatal_help "unrecognized option \`$opt'" ;; + + *) nonopt="$opt" + break + ;; + esac + done + + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: ;; *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute + opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + ;; + esac - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi + # Having warned about all mis-specified options, bail out if + # anything was wrong. + $exit_cmd $EXIT_FAILURE +} + +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF fi - ;; - esac + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +## ----------- ## +## Main. ## +## ----------- ## + +$opt_help || { + # Sanity checks first: + func_check_version_match + + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi + test -z "$mode" && func_fatal_error "error: you must specify a MODE." + + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 exit $EXIT_FAILURE fi # Change the help message to a mode-specific one. generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." + help="Try \`$progname --help --mode=$mode' for more information." +} - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; +# func_lalib_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_lalib_p () +{ + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} - target ) - libobj="$arg" - arg_mode=normal - continue - ;; +# func_lalib_unsafe_p file +# True iff FILE is a libtool `.la' library or `.lo' object file. +# This function implements the same check as func_lalib_p without +# resorting to external programs. To this end, it redirects stdin and +# closes it afterwards, without saving the original file descriptor. +# As a safety measure, use it only where a negative result would be +# fatal anyway. Works if `file' does not exist. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case "$lalib_p_line" in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test "$lalib_p" = yes +} - normal ) - # Accept any command-line options. - case $arg in - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + func_lalib_p "$1" +} - -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_ltwrapper_scriptname_result="" + if func_ltwrapper_executable_p "$1"; then + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + fi +} + +# func_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} + + +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $opt_debug + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs + eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +} + + +# func_source file +# Source FILE, adding directory component if necessary. +# Note that it is not necessary on cygwin/mingw to append a dot to +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +# behavior happens only for exec(3), not for open(2)! Also, sourcing +# `FILE.' does not work on cygwin managed mounts. +func_source () +{ + $opt_debug + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; + esac +} + + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $opt_debug + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" + done + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" + done + case "$@ " in + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" + func_fatal_error "specify a tag with \`--tag'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi +} + + + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=${1} + if test "$build_libtool_libs" = yes; then + write_lobj=\'${2}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T <\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" + func_quote_for_eval "$arg" + lastarg="$lastarg $func_quote_for_eval_result" done IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result # Add the arguments to base_compile. base_compile="$base_compile $lastarg" continue ;; - * ) + *) # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # @@ -744,66 +1187,42 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - base_compile="$base_compile $lastarg" + func_quote_for_eval "$lastarg" + base_compile="$base_compile $func_quote_for_eval_result" done # for arg case $arg_mode in arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE + func_fatal_error "you must specify an argument for -Xcompile" ;; target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE + func_fatal_error "you must specify a target with \`-o'" ;; *) # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + test -z "$libobj" && { + func_basename "$srcfile" + libobj="$func_basename_result" + } ;; esac # Recognize several different file suffixes. # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.[fF][09]?) xform=[fF][09]. ;; - *.for) xform=for ;; - *.java) xform=java ;; - *.obj) xform=obj ;; - *.sx) xform=sx ;; + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.obj | *.sx) + func_xform "$libobj" + libobj=$func_xform_result + ;; esac - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE + func_fatal_error "cannot determine name of library object from \`$libobj'" ;; esac @@ -811,7 +1230,15 @@ for arg in $later; do case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + continue + ;; + -static) + build_libtool_libs=no build_old_libs=yes continue ;; @@ -828,28 +1255,17 @@ esac done - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name \`$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" + objname="$func_basename_result" + xdir="$func_dirname_result" lobj=${xdir}$objdir/$objname - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. if test "$build_old_libs" = yes; then @@ -858,12 +1274,9 @@ removelist="$lobj $libobj ${libobj}T" fi - $run $rm $removelist - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in - cygwin* | mingw* | pw32* | os2*) + cygwin* | mingw* | pw32* | os2* | cegcc*) pic_mode=default ;; esac @@ -875,10 +1288,8 @@ # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 else output_obj= need_locks=no @@ -888,13 +1299,13 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" sleep 2 done elif test "$need_locks" = warn; then if test -f "$lockfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile exists and contains: `cat $lockfile 2>/dev/null` @@ -905,34 +1316,22 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - $echo "$srcfile" > "$lockfile" + removelist="$removelist $output_obj" + $ECHO "$srcfile" > "$lockfile" fi + $opt_dry_run || $RM $removelist + removelist="$removelist $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac - - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -985,45 +1371,27 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi # Just move the object if needed, then go on to compile the next one if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' fi - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ + $ECHO "\ *** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` @@ -1057,5485 +1420,6784 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." - $run $rm $removelist + $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi # Just move the object if needed if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' fi - - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" +Compile a source file into a libtool library object. - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac +This mode accepts the following additional options: - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to building PIC objects only + -prefer-non-pic try to building non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix \`.c' with the +library object suffix, \`.lo'." + ;; - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +Automatically set library path, then run a program. - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" +This mode accepts the following additional options: - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi + -dlopen FILE add the directory containing FILE to the library path - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi +This mode sets the library path environment variable according to \`-dlopen' +flags. - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" +Then, COMMAND is executed, with ARGS as arguments." + ;; - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +Complete the installation of libtool libraries. - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" +Each LIBDIR is a directory that contains libtool libraries. - prevarg="$arg" +The commands that this mode executes may require superuser privileges. Use +the \`--dry-run' option if you just want to see what would be executed." + ;; - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; +Install executables or libraries. - -avoid-version) - avoid_version=yes - continue - ;; +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. - -dlopen) - prev=dlfiles - continue - ;; +The following components of INSTALL-COMMAND are treated specially: - -dlpreopen) - prev=dlprefiles - continue - ;; + -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -export-dynamic) - export_dynamic=yes - continue - ;; +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; +Link object files or libraries together to form another library, or to +create an executable program. - -inst-prefix-dir) - prev=inst_prefix - continue - ;; +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; +The following components of LINK-COMMAND are treated specially: - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - continue - ;; + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; +All other options (arguments beginning with \`-') are ignored. - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; +Every other argument is treated as a filename. Files ending in \`.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is +required, except when creating a convenience library. - -multi_module) - single_module="${wl}-multi_module" - continue - ;; +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. - -module) - module=yes - continue - ;; +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." + ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" - continue +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." ;; - -shrext) - prev=shrext - continue - ;; + *) + func_fatal_help "invalid operation mode \`$mode'" + ;; + esac - -no-fast-install) - fast_install=no - continue - ;; + $ECHO + $ECHO "Try \`$progname --help' for more information about other modes." - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; + exit $? +} - -no-undefined) - allow_undefined=no - continue - ;; + # Now that we've collected a possible --mode arg, show help if necessary + $opt_help && func_mode_help - -objectlist) - prev=objectlist - continue - ;; - -o) prev=output ;; +# func_mode_execute arg... +func_mode_execute () +{ + $opt_debug + # The first argument is the command name. + cmd="$nonopt" + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" - -precious-files-regex) - prev=precious_regex - continue - ;; + # Handle -dlopen flags immediately. + for file in $execute_dlfiles; do + test -f "$file" \ + || func_fatal_help "\`$file' is not a file" - -release) - prev=release - continue - ;; + dir= + case $file in + *.la) + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" - -rpath) - prev=rpath - continue - ;; + # Read the libtool library. + dlname= + library_names= + func_source "$file" - -R) - prev=xrpath - continue - ;; + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ + func_warning "\`$file' was not linked with \`-export-dynamic'" + continue + fi - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; + func_dirname "$file" "" "." + dir="$func_dirname_result" - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue + if test -f "$dir/$objdir/$dlname"; then + dir="$dir/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + fi + fi ;; - -thread-safe) - thread_safe=yes - continue + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir="$func_dirname_result" ;; - -version-info) - prev=vinfo - continue - ;; - -version-number) - prev=vinfo - vinfo_number=yes + *) + func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" continue ;; + esac - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir="$absdir" - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done - -Xcompiler) - prev=xcompiler - continue - ;; + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" - -Xlinker) - prev=xlinker - continue + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -*) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + file="$progdir/$program" + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file="$progdir/$program" + fi ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_quote_for_eval "$file" + args="$args $func_quote_for_eval_result" + done - -XCClinker) - prev=xcclinker - continue - ;; + if test "X$opt_dry_run" = Xfalse; then + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done - *.$objext) - # A standard object. - objs="$objs $arg" - ;; + # Now prepare to actually exec the command. + exec_cmd="\$cmd$args" + else + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + $ECHO "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + fi +} - *.lo) - # A libtool-controlled object. +test "$mode" = execute && func_mode_execute ${1+"$@"} - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libdirs="$nonopt" + admincmds= - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $cmds" + fi + done + fi - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi + $ECHO "X----------------------------------------------------------------------" | $Xsed + $ECHO "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + $ECHO + $ECHO "If you ever happen to want to link against installed libraries" + $ECHO "in a given directory, LIBDIR, you must either use libtool, and" + $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" + $ECHO "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" + $ECHO " during execution" + fi + if test -n "$runpath_var"; then + $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" + $ECHO " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + $ECHO - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi + $ECHO "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" + $ECHO "pages." + ;; + *) + $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + $ECHO "X----------------------------------------------------------------------" | $Xsed + exit $EXIT_SUCCESS +} - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" +test "$mode" = finish && func_mode_finish ${1+"$@"} - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi +# func_mode_install arg... +func_mode_install () +{ + $opt_debug + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + # Allow the use of GNU shtool's install command. + $ECHO "X$nonopt" | $GREP shtool >/dev/null; then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - ;; + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" + install_prog="$install_prog$func_quote_for_eval_result" - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=no + stripme= + for arg + do + if test -n "$dest"; then + files="$files $dest" + dest=$arg continue - ;; - - *.la) - # A libtool-controlled library. + fi - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" + case $arg in + -d) isdir=yes ;; + -f) + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then prev= else - deplibs="$deplibs $arg" + dest=$arg + continue fi - continue ;; + esac - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + install_prog="$install_prog $func_quote_for_eval_result" + done - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -n "$prev" && \ + func_fatal_help "the \`$prev' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi fi - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + dest=$func_stripname_result - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + # Check to see that the destination is a directory. + test -d "$dest" && isdir=yes + if test "$isdir" = yes; then + destdir="$dest" + destname= else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + func_dirname_and_basename "$dest" "" "." + destdir="$func_dirname_result" + destname="$func_basename_result" - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status - fi + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ + func_fatal_help "\`$dest' is not a directory" fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; *) - duplicate_compiler_generated_deps=$duplicate_deps + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "\`$destdir' must be an absolute directory name" + ;; + esac + done ;; esac - specialdeplibs= - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + staticlibs="$staticlibs $file" + ;; + + *.la) + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" + + library_names= + old_library= + relink_command= + func_source "$file" + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) current_libdirs="$current_libdirs $libdir" ;; esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) future_libdirs="$future_libdirs $libdir" ;; + esac + fi - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE + func_dirname "$file" "/" "" + dir="$func_dirname_result" + dir="$dir$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ + func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + fi + + func_warning "relinking \`$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then + realname="$1" + shift + + srcname="$realname" + test -n "$relink_command" && srcname="$realname"T + + # Install the shared library and build the symlinks. + func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' + tstripme="$stripme" + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme="" + ;; + esac ;; esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - for pass in $passes; do - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # Try `ln -sf' first, because the `ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because the file extensions .$libext of this argument makes me believe" - $echo "*** that it is just a static archive that I should not used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 - exit $EXIT_FAILURE - fi - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE + # Do each command in the postinstall commands. + lib="$destdir/$realname" + func_execute_cmds "$postinstall_cmds" 'exit $?' fi - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= + # Install the pseudo-library for information purposes. + func_basename "$file" + name="$func_basename_result" + instname="$dir/$name"i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + ;; - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac + *.lo) + # Install (i.e. copy) a libtool object. - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" fi - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $EXIT_FAILURE - fi - continue - fi # $pass = conv + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest="$destfile" + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to \`$destfile'" + ;; + esac + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' fi + exit $EXIT_SUCCESS + ;; - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext="" + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=".exe" + fi + ;; + esac + + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= + + func_source "$wrapper" + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script \`$wrapper'" + + finalize=yes + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi + libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + if test -n "$libdir" && test ! -f "$libfile"; then + func_warning "\`$lib' has not been installed in \`$libdir'" + finalize=no + fi + done + + relink_command= + func_source "$wrapper" + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + $opt_dry_run || { + if test "$finalize" = yes; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file="$func_basename_result" + outputname="$tmpdir/$file" + # Replace the output file specification. + relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_silent || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else + func_error "error: relink \`$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file="$outputname" + else + func_warning "cannot relink \`$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac ;; esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" + fi + ;; + esac + done - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" + for file in $staticlibs; do + func_basename "$file" + name="$func_basename_result" + + # Set up the ranlib parameters. + oldlib="$destdir/$name" + + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $oldlib" 'exit $?' + fi + + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done + + test -n "$future_libdirs" && \ + func_warning "remember to run \`$progname --finish$future_libdirs'" + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi +} + +test "$mode" = install && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# a dlpreopen symbol table. +func_generate_dlsyms () +{ + $opt_debug + my_outputname="$1" + my_originator="$2" + my_pic_p="${3-no}" + my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms="${my_outputname}S.c" + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi + + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$output_objdir/${my_outputname}.nm" + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + + # Parse the name list into a source file. + func_verbose "creating $output_objdir/$my_dlsyms" + + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +/* External symbol declarations for the compiler. */\ +" + + if test "$dlself" = yes; then + func_verbose "generating symbol list for \`$output'" + + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + for progfile in $progfiles; do + func_verbose "extracting global C symbols from \`$progfile'" + $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols="$output_objdir/$outputname.exp" + $opt_dry_run || { + $RM $export_symbols + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + $opt_dry_run || { + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + fi - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE + for dlprefile in $dlprefiles; do + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + name="$func_basename_result" + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + done + + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" + + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : else - newdlprefiles="$newdlprefiles $dir/$linklib" + $GREP -v "^: " < "$nlist" > "$nlist"S fi - fi # $pass = dlpreopen - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - deplibs="$lib $deplibs" # used for prog,scan pass + $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - continue - fi + $ECHO >> "$output_objdir/$my_dlsyms" "\ - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" +/* The mapping between symbol names and symbols. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; +" + case $host in + *cygwin* | *mingw* | *cegcc* ) + $ECHO >> "$output_objdir/$my_dlsyms" "\ +/* DATA imports from DLLs on WIN32 con't be const, because + runtime relocations are performed -- see ld's documentation + on pseudo-relocs. */" + lt_dlsym_const= ;; + *osf5*) + echo >> "$output_objdir/$my_dlsyms" "\ +/* This system does not cope well with relocations in const data */" + lt_dlsym_const= ;; + *) + lt_dlsym_const=const ;; + esac - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi + $ECHO >> "$output_objdir/$my_dlsyms" "\ +extern $lt_dlsym_const lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[]; +$lt_dlsym_const lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{\ + { \"$my_originator\", (void *) 0 }," - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac + $ECHO >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + if test "X$my_pic_p" != Xno; then + pic_flag_for_symtable=" $pic_flag" + fi + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) symtab_cflags="$symtab_cflags $arg" ;; + esac + done - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library + # Now compile the dynamic symbol file. + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - # Warn about portability, can't link against -module's on - # some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then - $echo - if test "$linkmode" = prog; then - $echo "*** Warning: Linking the executable $output against the loadable module" - else - $echo "*** Warning: Linking the shared library $output against the loadable module" - fi - $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac + # Clean up the generated files. + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + + # Transform the symbol file into the correct name. + symfileobj="$output_objdir/${my_outputname}S.$objext" + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + else + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` fi + ;; + *) + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + fi +} - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +func_win32_libid () +{ + $opt_debug + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | + $SED -n -e ' + 1,100{ + / I /{ + s,.*,import, + p + q + } + }'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + $opt_debug + f_ex_an_ar_dir="$1"; shift + f_ex_an_ar_oldlib="$1" + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; then - $echo "** Warning, lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $echo - $echo "** And there doesn't seem to be a static archive available" - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $opt_debug + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib="$func_basename_result" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi + func_mkdir_p "$my_xdir" - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" + case $host in + *-darwin*) + func_verbose "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + $opt_dry_run || { + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`basename "$darwin_archive"` + darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" + cd "$darwin_curdir" + $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $echo - $echo "*** Warning: This system can not link to static lib archive $lib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - $echo "*** But as you try to build a module library, libtool will still create " - $echo "*** a static module, that should work as long as the dlopening application" - $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? + func_extract_archives_result="$my_oldobjs" +} - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$deplibdir/$depdepl" ; then - depdepl="$deplibdir/$depdepl" - elif test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - else - # Can't find it, oh well... - depdepl= - fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; - *) newlib_search_path="$newlib_search_path $path";; - esac - fi - path="" - ;; - *) - path="-L$path" - ;; - esac - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= +# func_emit_wrapper_part1 [arg=no] +# +# Emit the first part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part1 () +{ + func_emit_wrapper_part1_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part1_arg1=$1 fi - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" + $ECHO "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='${SED} -e 1s/^X//' +sed_quote_subst='$sed_quote_subst' + +# Be Bourne compatible +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + ECHO=\"$qecho\" + file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then + # Yippee, \$ECHO works! + : + else + # Restart under the correct shell, and then maybe \$ECHO will work. + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} fi + fi\ +" + $ECHO "\ - case $linkmode in - oldlib) - case " $deplibs" in - *\ -l* | *\ -L*) - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; esac + fi - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + done +" +} +# end: func_emit_wrapper_part1 - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi +# func_emit_wrapper_part2 [arg=no] +# +# Emit the second part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part2 () +{ + func_emit_wrapper_part2_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part2_arg1=$1 + fi + + $ECHO "\ + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi + if test "$fast_install" = yes; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi + file=\"\$\$-\$program\" - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac + $ECHO "\ - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit $EXIT_FAILURE + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi + + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" fi - fi - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi + $ECHO "\ - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" + if test -f \"\$progdir/\$program\"; then" - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + + export $shlibpath_var +" fi - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" fi - else - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} +# end: func_emit_wrapper_part2 - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=no + if test -n "$1" ; then + func_emit_wrapper_arg1=$1 fi - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible + # split this up so that func_emit_cwrapperexe_src + # can call each part independently. + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" +} - case $vinfo_number in - yes) - number_major="$2" - number_minor="$3" - number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows|none) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# func_to_host_path arg +# +# Convert paths to host format when used with build tools. +# Intended for use with "native" mingw (where libtool itself +# is running under the msys shell), or in the following cross- +# build environments: +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# where wine is equipped with the `winepath' executable. +# In the native mingw case, the (msys) shell automatically +# converts paths for any non-msys applications it launches, +# but that facility isn't available from inside the cwrapper. +# Similar accommodations are necessary for $host mingw and +# $build cygwin. Calling this function does no harm for other +# $host/$build combinations not listed above. +# +# ARG is the path (on $build) that should be converted to +# the proper representation for $host. The result is stored +# in $func_to_host_path_result. +func_to_host_path () +{ + func_to_host_path_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + case $build in + *mingw* ) # actually, msys + # awkward: cmd appends spaces to result + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_path_tmp1=`( cmd //c echo "$1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_path_tmp1=`cygpath -w "$1"` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # Unfortunately, winepath does not exit with a non-zero + # error code, so we are forced to check the contents of + # stdout. On the other hand, if the command is not + # found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both + # error code of zero AND non-empty stdout, which explains + # the odd construction: + func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + else + # Allow warning below. + func_to_host_path_result="" + fi + ;; + esac + if test -z "$func_to_host_path_result" ; then + func_error "Could not determine host path corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_path_result="$1" + fi + ;; + esac + fi +} +# end: func_to_host_path - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# func_to_host_pathlist arg +# +# Convert pathlists to host format when used with build tools. +# See func_to_host_path(), above. This function supports the +# following $build/$host combinations (but does no harm for +# combinations not listed here): +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# +# Path separators are also converted from $build format to +# $host format. If ARG begins or ends with a path separator +# character, it is preserved (but converted to $host format) +# on output. +# +# ARG is a pathlist (on $build) that should be converted to +# the proper representation on $host. The result is stored +# in $func_to_host_pathlist_result. +func_to_host_pathlist () +{ + func_to_host_pathlist_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_to_host_pathlist_tmp2="$1" + # Once set for this call, this variable should not be + # reassigned. It is used in tha fallback case. + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e 's|^:*||' -e 's|:*$||'` + case $build in + *mingw* ) # Actually, msys. + # Awkward: cmd appends spaces to result. + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # unfortunately, winepath doesn't convert pathlists + func_to_host_pathlist_result="" + func_to_host_pathlist_oldIFS=$IFS + IFS=: + for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do + IFS=$func_to_host_pathlist_oldIFS + if test -n "$func_to_host_pathlist_f" ; then + func_to_host_path "$func_to_host_pathlist_f" + if test -n "$func_to_host_path_result" ; then + if test -z "$func_to_host_pathlist_result" ; then + func_to_host_pathlist_result="$func_to_host_path_result" + else + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + fi + fi + fi + IFS=: + done + IFS=$func_to_host_pathlist_oldIFS + ;; + esac + if test -z "$func_to_host_pathlist_result" ; then + func_error "Could not determine the host path(s) corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This may break if $1 contains DOS-style drive + # specifications. The fix is not to complicate the expression + # below, but for the user to provide a working wine installation + # with winepath so that path translation in the cross-to-mingw + # case works properly. + lt_replace_pathsep_nix_to_dos="s|:|;|g" + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_replace_pathsep_nix_to_dos"` + fi + # Now, add the leading and trailing path separators back + case "$1" in + :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" + ;; + esac + case "$1" in + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + ;; + esac + ;; + esac + fi +} +# end: func_to_host_pathlist - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat <&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - fi +/* $cwrappersource - temporary wrapper executable for $objdir/$outputname + Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; + The $output program cannot be directly executed until all the libtool + libraries that it depends on are installed. - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; + This wrapper executable should never be moved out of the build directory. + If it is, it will not operate correctly. - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; + Currently, it simply execs the wrapper *script* "$SHELL $output", + but could eventually absorb all of the scripts functionality and + exec $objdir/$outputname directly. +*/ +EOF + cat <<"EOF" +#include +#include +#ifdef _MSC_VER +# include +# include +# include +# define setmode _setmode +#else +# include +# include +# ifdef __CYGWIN__ +# include +# define HAVE_SETENV +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - major=`expr $current - $age` - else - major=`expr $current - $age + 1` - fi - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done +#ifdef _MSC_VER +# define S_IXUSR _S_IEXEC +# define stat _stat +# ifndef _INTPTR_T_DEFINED +# define intptr_t int +# endif +#endif - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif - osf) - major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac +#undef LTWRAPPER_DEBUGPRINTF +#if defined DEBUGWRAPPER +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +static void +ltwrapper_debugprintf (const char *fmt, ...) +{ + va_list args; + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); +} +#else +# define LTWRAPPER_DEBUGPRINTF(args) +#endif - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi +const char *program_name = NULL; - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_fatal (const char *message, ...); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_opt_process_env_set (const char *arg); +void lt_opt_process_env_prepend (const char *arg); +void lt_opt_process_env_append (const char *arg); +int lt_split_name_value (const char *arg, char** name, char** value); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi +static const char *script_text_part1 = +EOF - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; - esac - done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi + func_emit_wrapper_part1 yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + cat <"))); + for (i = 0; i < newargc; i++) + { + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + } - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for file magic test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a file magic. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval $echo \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $echo - if test "X$deplibs_check_method" = "Xnone"; then - $echo "*** Warning: inter-library dependencies are not supported in this platform." - else - $echo "*** Warning: inter-library dependencies are not known to be supported." - fi - $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac + case $host_os in + mingw*) + cat <<"EOF" + /* execv doesn't actually work on mingw as expected on unix */ + rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); + if (rval == -1) + { + /* failed to start process */ + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + return 127; + } + return rval; +EOF + ;; + *) + cat <<"EOF" + execv (lt_argv_zero, newargz); + return rval; /* =127, but avoids unused variable warning */ +EOF + ;; + esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $echo - $echo "*** Warning: libtool could not satisfy all declared inter-library" - $echo "*** dependencies of module $libname. Therefore, libtool will create" - $echo "*** a static module, that should work as long as the dlopening" - $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - $echo "*** The inter-library dependencies that have been dropped here will be" - $echo "*** automatically added whenever a program is linked with this library" - $echo "*** or is declared to -dlopen it." + cat <<"EOF" +} - if test "$allow_undefined" = no; then - $echo - $echo "*** Since this library must not contain undefined symbols," - $echo "*** because either the platform does not support them or" - $echo "*** it was explicitly requested with -no-undefined," - $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi +void * +xmalloc (size_t num) +{ + void *p = (void *) malloc (num); + if (!p) + lt_fatal ("Memory exhausted"); + return p; +} - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" +char * +xstrdup (const char *string) +{ + return string ? strcpy ((char *) xmalloc (strlen (string) + 1), + string) : NULL; +} +const char * +base_name (const char *name) +{ + const char *base; - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over the disk name in MSDOS pathnames. */ + if (isalpha ((unsigned char) name[0]) && name[1] == ':') + name += 2; +#endif - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - case $archive_cmds in - *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; - *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; - esac - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; + return base; +} - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi +int +check_executable (const char *path) +{ + struct stat st; - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); + if ((!path) || (!*path)) + return 0; - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi + if ((stat (path, &st) >= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} - lib="$output_objdir/$realname" - linknames= - for link - do - linknames="$linknames $link" - done +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); + if ((!path) || (!*path)) + return 0; - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + int tmp_len; + char *concat_name; - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } +#endif - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} - if test "X$skipped_export" != "X:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", + tmp_pathspec)); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + char *errstr = strerror (errno); + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + } + } + XFREE (tmp_pathspec); - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$output_la-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + if (!has_symlinks) + { + return xstrdup (pathspec); + } - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadable object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal ("Could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} - $echo "creating a temporary reloadable object file: $output" +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" + assert (str != NULL); + assert (pat != NULL); - libobjs=$output - # Restore the value of output. - output=$save_output + len = strlen (str); + patlen = strlen (pat); - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. + if (patlen <= len) + { + str += len - patlen; + if (strcmp (str, pat) == 0) + *str = '\0'; + } + return str; +} - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi +static void +lt_error_core (int exit_status, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s: %s: ", program_name, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? + if (exit_status >= 0) + exit (exit_status); +} - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi +void +lt_fatal (const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + va_end (ap); +} - exit $lt_exit - } - done - IFS="$save_ifs" +void +lt_setenv (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", + (name ? name : ""), + (value ? value : ""))); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + int len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + int orig_value_len = strlen (orig_value); + int add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - fi - fi +int +lt_split_name_value (const char *arg, char** name, char** value) +{ + const char *p; + int len; + if (!arg || !*arg) + return 1; - exit $EXIT_SUCCESS - fi + p = strchr (arg, (int)'='); - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; + if (!p) + return 1; - obj) - case " $deplibs" in - *\ -l* | *\ -L*) - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; - esac + *value = xstrdup (++p); - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi + len = strlen (arg) - strlen (*value); + *name = XMALLOC (char, len); + strncpy (*name, arg, len-1); + (*name)[len - 1] = '\0'; - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi + return 0; +} - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi +void +lt_opt_process_env_set (const char *arg) +{ + char *name = NULL; + char *value = NULL; - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); + } - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi + lt_setenv (name, value); + XFREE (name); + XFREE (value); +} - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac +void +lt_opt_process_env_prepend (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; - # Delete the old objects. - $run $rm $obj $libobj + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); + } - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= + new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" +void +lt_opt_process_env_append (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); + } - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + new_value = lt_extend_str (getenv (name), value, 1); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} - output="$obj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" +void +lt_update_exe_path (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} - exit $EXIT_SUCCESS - fi +void +lt_update_lib_path (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi +EOF +} +# end: func_emit_cwrapperexe_src - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi +# func_mode_link arg... +func_mode_link () +{ + $opt_debug + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no - exit $EXIT_SUCCESS + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll which has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt - prog) - case $host in - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi + avoid_version=no + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=no + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module="${wl}-single_module" + func_infer_tag $base_compile - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) + if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break ;; esac + done - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - if test "$tagname" = CXX ; then - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - fi - ;; - esac + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" ;; - *) new_libs="$new_libs $deplib" ;; esac - done - compile_deplibs="$new_libs" - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + case $prev in + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=yes + fi + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac + dlself=needless + export_dynamic=yes fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + prev= + continue + ;; + *) + if test "$prev" = dlfiles; then + dlfiles="$dlfiles $arg" + else + dlprefiles="$dlprefiles $arg" + fi + prev= + continue + ;; esac ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; + expsyms) + export_symbols="$arg" + test -f "$arg" \ + || func_fatal_error "symbol file \`$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) deplibs="$deplibs $qarg.ltframework" # this is fixed later + ;; esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + ;; esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi + prev= + continue + ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# moreargs="$moreargs $fil" + arg=$fil + # A libtool-controlled object. - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" + # Read the .lo file + func_source "$arg" - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" -#ifdef __cplusplus -extern \"C\" { -#endif + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi -/* External symbol declarations for the compiler. */\ -" + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi done - - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - else - $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - fi + else + func_fatal_error "link input file \`$arg' does not exist" fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ -const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - fi - - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac + arg=$save_arg + prev= + continue + ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; esac - - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` - else - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` - ;; - esac + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; + *) rpath="$rpath $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) xrpath="$xrpath $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; + weak) + weak_libs="$weak_libs $arg" + prev= + continue + ;; + xcclinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + compiler_flags="$compiler_flags $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue ;; *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE + eval "$prev=\"\$arg\"" + prev= + continue ;; esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` - link_command="$compile_command$compile_rpath" + fi # test -n "$prev" - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - exit_status=$? + prevarg="$arg" - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" fi + continue + ;; - exit $exit_status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "\`-allow-undefined' must not be used because it is the default" + ;; - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi + -avoid-version) + avoid_version=yes + continue + ;; - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi + -dlopen) + prev=dlfiles + continue + ;; - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi + -dlpreopen) + prev=dlprefiles + continue + ;; - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + -export-dynamic) + export_dynamic=yes + continue + ;; - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else - # fast_install is set to needless - relink_command= - fi + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test "X$arg" = "X-export-symbols"; then + prev=expsyms else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" + prev=expsyms_regex fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + continue + ;; - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname + -framework) + prev=framework + continue + ;; - $show "$link_command" - $run eval "$link_command" || exit $? + -inst-prefix-dir) + prev=inst_prefix + continue + ;; - # Now create the wrapper script. - $show "creating $output" + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" + -L*) + func_stripname '-L' '' "$arg" + dir=$func_stripname_result + if test -z "$dir"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + func_fatal_error "need path for \`-L' option" fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + fi + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" + ;; esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; + case "$deplibs " in + *" -L$dir "*) ;; + *) + deplibs="$deplibs -L$dir" + lib_search_path="$lib_search_path $dir" + ;; esac - # test for cygwin because mv fails w/o .exe extensions case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) dllsearchpath="$dllsearchpath:$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac + ;; esac - case $host in - *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + continue + ;; - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include -#include -#include -#include + -multi_module) + single_module="${wl}-multi_module" + continue + ;; -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif + -no-fast-install) + fast_install=no + continue + ;; -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "\`-no-install' is ignored for $host" + func_warning "assuming \`-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif + -no-undefined) + allow_undefined=no + continue + ;; -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ + -objectlist) + prev=objectlist + continue + ;; -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ + -o) prev=output ;; -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) + -precious-files-regex) + prev=precious_regex + continue + ;; -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif + -release) + prev=release + continue + ;; -const char *program_name = NULL; + -rpath) + prev=rpath + continue + ;; -void * xmalloc (size_t num); -char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); + -R) + prev=xrpath + continue + ;; -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) xrpath="$xrpath $dir" ;; + esac + continue + ;; - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); -EOF + -shared) + # The effects of -shared are defined in a previous loop. + continue + ;; - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; - for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - return 127; -} + -weak) + prev=weak + continue + ;; -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; - return p; -} + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" + linker_flags="$linker_flags $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} + -Xcompiler) + prev=xcompiler + continue + ;; -const char * -base_name (const char *name) -{ - const char *base; + -Xlinker) + prev=xlinker + continue + ;; -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; -#endif + -XCClinker) + prev=xcclinker + continue + ;; - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return base; -} + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; -int -check_executable(const char * path) -{ - struct stat st; + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" + compiler_flags="$compiler_flags $arg" + continue + ;; - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} + *.$objext) + # A standard object. + objs="$objs $arg" + ;; -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ -char * -find_executable (const char* wrapper) -{ - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; + *.lo) + # A libtool-controlled object. - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; + # Read the .lo file + func_source "$arg" - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif + if test -z "$pic_object" || + test -z "$non_pic_object" || + test "$pic_object" = none && + test "$non_pic_object" = none; then + func_fatal_error "cannot find name of object for \`$arg'" + fi - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; -} + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + dlfiles="$dlfiles $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi - assert(str != NULL); - assert(pat != NULL); + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + dlprefiles="$dlprefiles $pic_object" + prev= + fi - len = strlen(str); - patlen = strlen(pat); + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + non_pic_object="$xdir$non_pic_object" -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test "$pic_object" = none ; then + arg="$non_pic_object" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" - if (exit_status >= 0) - exit (exit_status); -} + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + ;; -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + *.$libext) + # An archive. + deplibs="$deplibs $arg" + old_deplibs="$old_deplibs $arg" + continue + ;; - $echo > $output "\ -#! $SHELL + *.la) + # A libtool-controlled library. -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. + dlfiles="$dlfiles $arg" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. + dlprefiles="$dlprefiles $arg" + prev= + else + deplibs="$deplibs $arg" + fi + continue + ;; -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + esac # arg -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + test -n "$prev" && \ + func_fatal_help "the \`$prevarg' option requires an argument" -relink_command=\"$relink_command\" + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + outputname="$func_basename_result" + libobjs_save="$libobjs" + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var + eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + shlib_search_path= fi - fi\ -" - $echo >> $output "\ + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" + # Create the object directory. + func_mkdir_p "$output_objdir" - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do + if $opt_duplicate_deps ; then + case "$libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + libs="$libs $deplib" + done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + esac + pre_post_deps="$pre_post_deps $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=no + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... + if test "$linkmode,$pass" = "lib,link"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done + deplibs="$tmp_deplibs" + fi + + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi + if test "$linkmode" = prog; then + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + case $lib in + *.la) func_source "$lib" ;; + esac + + # Collect preopened libtool deplibs, except any this library + # has declared as weak libs + for deplib in $dependency_libs; do + deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + case " $weak_libs " in + *" $deplib_base "*) ;; + *) deplibs="$deplibs $deplib" ;; + esac + done + done + libs="$dlprefiles" + fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi + + for deplib in $libs; do + lib= + found=no + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + compiler_flags="$compiler_flags $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + func_warning "\`-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done + done + if test "$found" != yes; then + # deplib doesn't seem to be a libtool library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + else # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi + fi + ;; # -l + *.ltframework) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + prog) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" + dir=$func_stripname_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) xrpath="$xrpath $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) lib="$deplib" ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=no + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=yes + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then + $ECHO + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because the file extensions .$libext of this argument makes me believe" + $ECHO "*** that it is just a static archive that I should not use here." + else + $ECHO + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + fi + ;; + esac + continue + ;; + prog) + if test "$pass" != link; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + newdlprefiles="$newdlprefiles $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + newdlfiles="$newdlfiles $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=yes + continue + ;; + esac # case $deplib + + if test "$found" = yes || test -f "$lib"; then : + else + func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" + fi + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ + || func_fatal_error "\`$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # Convert "-framework foo" to "foo.ltframework" + if test -n "$inherited_linker_flags"; then + tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; + *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; + esac + done + fi + dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then + test -n "$dlopen" && dlfiles="$dlfiles $dlopen" + test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + fi + + if test "$pass" = conv; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + continue + fi # $pass = conv + + + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do + linklib="$l" + done + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + + # This library was specified with -dlopen. + if test "$pass" = dlopen; then + if test -z "$libdir"; then + func_fatal_error "cannot -dlopen a convenience library: \`$lib'" + fi + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + dlprefiles="$dlprefiles $lib $dependency_libs" + else + newdlfiles="$newdlfiles $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "passing it literally to the linker, although it might fail" + abs_ladir="$ladir" + fi + ;; + esac + func_basename "$lib" + laname="$func_basename_result" + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else + dir="$libdir" + absdir="$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test "$pass" = dlpreopen; then + if test -z "$libdir" && test "$linkmode" = prog; then + func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + fi + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + newdlprefiles="$newdlprefiles $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + newdlprefiles="$newdlprefiles $dir/$dlname" + else + newdlprefiles="$newdlprefiles $dir/$linklib" + fi + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test "$linkmode" = lib; then + deplibs="$dir/$old_library $deplibs" + elif test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test "$linkmode" = prog && test "$pass" != link; then + newlib_search_path="$newlib_search_path $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=no + if test "$link_all_deplibs" != no || test -z "$library_names" || + test "$build_libtool_libs" = no; then + linkalldeplibs=yes + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + newlib_search_path="$newlib_search_path $func_stripname_result" + ;; + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; + *) temp_rpath="$temp_rpath$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes; then + use_static_libs=no + fi + if test -n "$library_names" && + { test "$use_static_libs" = no || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded + notinst_deplibs="$notinst_deplibs $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule="" + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule="$dlpremoduletest" + break + fi + done + if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + $ECHO + if test "$linkmode" = prog; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi + if test "$linkmode" = lib && + test "$hardcode_into_libs" = yes; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + realname="$1" + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname="$dlname" + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + esac + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" + func_basename "$soroot" + soname="$func_basename_result" + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + func_verbose "extracting exported symbol list from \`$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + func_verbose "generating import library for \`$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$mode" != relink; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we can not + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $GREP ": [^:]* bundle" >/dev/null ; then + if test "X$dlopenmodule" != "X$lib"; then + $ECHO "*** Warning: lib $linklib is a module, not a shared library" + if test -z "$old_library" ; then + $ECHO + $ECHO "*** And there doesn't seem to be a static archive available" + $ECHO "*** The link will probably fail, sorry" + else + add="$dir/$old_library" + fi + elif test -n "$old_library"; then + add="$dir/$old_library" + fi + fi + esac + elif test "$hardcode_minus_L" = no; then + case $host in + *-*-sunos*) add_shlibpath="$dir" ;; + esac + add_dir="-L$dir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = no; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + relink) + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$dir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$dir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test "$lib_linked" != yes; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test "$hardcode_direct" != yes && + test "$hardcode_minus_L" != yes && + test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + esac + fi + fi + fi + + if test "$linkmode" = prog || test "$mode" = relink; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes && + test "$hardcode_direct_absolute" = no; then + add="$libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + add_dir="-L$libdir" + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + fi + + if test "$linkmode" = prog; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test "$linkmode" = prog; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test "$hardcode_direct" != unsupported; then + test -n "$old_library" && linklib="$old_library" + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test "$build_libtool_libs" = yes; then + # Not a shared library + if test "$deplibs_check_method" != pass_all; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + $ECHO + $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have." + if test "$module" = yes; then + $ECHO "*** But as you try to build a module library, libtool will still create " + $ECHO "*** a static module, that should work as long as the dlopening application" + $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) xrpath="$xrpath $temp_xrpath";; + esac;; + *) temp_deplibs="$temp_deplibs $libdir";; + esac + done + dependency_libs="$temp_deplibs" + fi + + newlib_search_path="$newlib_search_path $absdir" + # Link against this library + test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done + + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in + -L*) path="$deplib" ;; + *.la) + func_dirname "$deplib" "" "." + dir="$func_dirname_result" + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + func_warning "cannot determine absolute directory name of \`$dir'" + absdir="$dir" + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) + depdepl= + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -z "$darwin_install_name"; then + darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi + compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" + path= + fi + fi + ;; + *) + path="-L$absdir/$objdir" + ;; + esac + else + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test "$pass" = link; then + if test "$linkmode" = "prog"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi + dependency_libs="$newdependency_libs" + if test "$pass" = dlpreopen; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test "$pass" != dlopen; then + if test "$pass" != conv; then + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) lib_search_path="$lib_search_path $dir" ;; + esac + done + newlib_search_path= + fi + + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" + else + vars="compile_deplibs finalize_deplibs" + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) tmp_libs="$tmp_libs $deplib" ;; + esac + ;; + *) tmp_libs="$tmp_libs $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + if test -n "$i" ; then + tmp_libs="$tmp_libs $i" + fi + done + dependency_libs=$tmp_libs + done # for pass + if test "$linkmode" = prog; then + dlfiles="$newdlfiles" + fi + if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "\`-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "\`-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" + objs="$objs$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ + func_fatal_help "libtool library \`$output' must begin with \`lib'" + + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + if test "$deplibs_check_method" != pass_all; then + func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + else + $ECHO + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + libobjs="$libobjs $objs" + fi + fi + + test "$dlself" != no && \ + func_warning "\`-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift + test "$#" -gt 1 && \ + func_warning "ignoring multiple \`-rpath's for a libtool library" + + install_libdir="$1" + + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + # Some compilers have problems with a `.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "\`-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + shift + IFS="$save_ifs" + + test -n "$7" && \ + func_fatal_help "too many parameters to \`-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major="$1" + number_minor="$2" + number_revision="$3" + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # which has an extra 1 added just for fun + # + case $version_type in + darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|sunos) + current="$number_major" + revision="$number_minor" + age="0" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_minor" + lt_irix_increment=no + ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; + esac + ;; + no) + current="$1" + revision="$2" + age="$3" + ;; + esac + + # Check that each of the things are valid numbers. + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "CURRENT \`$current' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "REVISION \`$revision' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "AGE \`$age' must be a nonnegative integer" + func_fatal_error "\`$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then + func_error "AGE \`$age' is greater than the current interface number \`$current'" + func_fatal_error "\`$vinfo' is not valid version information" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current" + ;; + + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring="$verstring_prefix$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring_prefix$major.$iface:$verstring" + done + + # Before this point, $major must not contain `.'. + major=.$major + versuffix="$major.$revision" + ;; + + linux) + func_arith $current - $age + major=.$func_arith_result + versuffix="$major.$age.$revision" + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test "$loop" -ne 0; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + verstring="$verstring:${current}.0" + ;; + + qnx) + major=".$current" + versuffix=".$current" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + + *) + func_fatal_configuration "unknown library version type \`$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring="0.0" + ;; + esac + if test "$need_version" = no; then + versuffix= + else + versuffix=".0.0" + fi + fi + + # Remove version info from name if versioning should be avoided + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= + verstring="" + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + func_warning "undefined symbols not allowed in $host shared libraries" + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + fi + + func_generate_dlsyms "$libname" "$libname" "yes" + libobjs="$libobjs $symfileobj" + test "X$libobjs" = "X " && libobjs= + + if test "$mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + removelist="$removelist $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + oldlibs="$oldlibs $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + #for path in $notinst_path; do + # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` + # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` + # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + temp_xrpath="$temp_xrpath -R$libdir" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles="$dlfiles" + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) dlfiles="$dlfiles $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles="$dlprefiles" + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) dlprefiles="$dlprefiles $lib" ;; + esac + done + + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + deplibs="$deplibs System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + deplibs="$deplibs -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release="" + versuffix="" + major="" + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; + *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + $ECHO + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + ;; + esac + fi + if test -n "$a_deplib" ; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib="$potent_lib" # see symlink-check above in file_magic test + if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + $ECHO + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" + if test -z "$potlib" ; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs="" + tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ + -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + for i in $predeps $postdeps ; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + done + fi + if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | + $GREP . >/dev/null; then + $ECHO + if test "X$deplibs_check_method" = "Xnone"; then + $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + else + $ECHO "*** Warning: inter-library dependencies are not known to be supported." + fi + $ECHO "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + fi + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library with the System framework + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + $ECHO + $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" + $ECHO "*** a static module, that should work as long as the dlopening" + $ECHO "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + $ECHO "*** The inter-library dependencies that have been dropped here will be" + $ECHO "*** automatically added whenever a program is linked with this library" + $ECHO "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then + $ECHO + $ECHO "*** Since this library must not contain undefined symbols," + $ECHO "*** because either the platform does not support them or" + $ECHO "*** it was explicitly requested with -no-undefined," + $ECHO "*** libtool will only create a static version of it." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + case $host in + *-*-darwin*) + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; esac - fi - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + + # Test again, we may have decided not to build it any more + if test "$build_libtool_libs" = yes; then + if test "$hardcode_into_libs" = yes; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" + test "$mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + dep_rpath="$dep_rpath $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi - if test "$fast_install" = yes; then - $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" + shlibpath="$finalize_shlibpath" + test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift - file=\"\$\$-\$program\" + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + if test -z "$dlname"; then + dlname=$soname + fi - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" + lib="$output_objdir/$realname" + linknames= + for link + do + linknames="$linknames $link" + done - $echo >> $output "\ + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit $EXIT_FAILURE - fi - fi + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" + delfiles="$delfiles $export_symbols" + fi + + orig_export_symbols= + case $host_os in + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. + orig_export_symbols="$export_symbols" + export_symbols= + always_export_symbols=yes + fi + fi + ;; + esac - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + func_len " $cmd" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS="$save_ifs" + if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi fi - $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + tmp_deplibs="$tmp_deplibs $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test "$compiler_needs_object" = yes && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - export $shlibpath_var -" + func_extract_archives $gentop $convenience + libobjs="$libobjs $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linker_flags="$linker_flags $flag" fi - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \$*\" - exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do + # Make a backup of the uninstalled library when relinking + if test "$mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi else - oldobjs="$old_deplibs $non_pic_objects" + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi fi - addlibs="$old_convenience" - fi - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + if test "X$skipped_export" != "X:" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" - fi + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + output_la=`$ECHO "X$output" | $Xsed -e "$basename"` - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + last_robj= + k=1 + + if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then + output=${output_objdir}/${output_la}.lnkscript + func_verbose "creating GNU ld script: $output" + $ECHO 'INPUT (' > $output + for obj in $save_libobjs do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." + $ECHO "$obj" >> $output + done + $ECHO ')' >> $output + delfiles="$delfiles $output" + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= + if test "$compiler_needs_object" = yes; then + firstobj="$1 " + shift + fi + for obj + do + $ECHO "$obj" >> $output + done + delfiles="$delfiles $output" + output=$firstobj\"$file_list_spec$output\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test "X$objlist" = X || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test "$k" -eq 1 ; then + # The first file doesn't have a previous command to add. + eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + else + # All subsequent reloadable object files will link in + # the last one created. + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 + k=$func_arith_result + output=$output_objdir/$output_la-${k}.$objext + objlist=$obj + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + if test -n "$last_robj"; then + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi + delfiles="$delfiles $output" - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + else + output= + fi + + if ${skipped_export-false}; then + func_verbose "generating symbol list for \`$libname.la'" + export_symbols="$output_objdir/$libname.exp" + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + fi + + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. + save_ifs="$IFS"; IFS='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS="$save_ifs" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi fi - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi + if ${skipped_export-false}; then + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + fi - eval cmds=\"$old_archive_cmds\" + libobjs=$output + # Restore the value of output. + output=$save_output - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; then - : + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= + cmds=$module_cmds fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi fi fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" + func_extract_archives $gentop $dlprefiles + libobjs="$libobjs $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break + # Restore the uninstalled library and exit + if test "$mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. -# The name that we can dlopen(3). -dlname='$tdlname' + exit $lt_exit + } + done + IFS="$save_ifs" -# Names of this library. -library_names='$library_names' + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? -# The name of the static archive. -old_library='$old_library' + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' + exit $EXIT_SUCCESS + fi -# Version information for $libname. -current=$current -age=$age -revision=$revision + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done -# Is this an already installed library? -installed=$installed + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi + ;; -# Should we warn about portability when linking against -modules? -shouldnotlink=$module + obj) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for objects" + fi -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for objects" ;; + esac -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi - done - fi + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for objects" - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit $EXIT_SUCCESS - ;; + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for objects" - # libtool install mode - install) - modename="$modename: install" + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for objects" - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" + test -n "$release" && \ + func_warning "\`-release' is ignored for objects" + + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ + func_fatal_error "cannot build library object \`$output' from non-libtool objects" + + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result + ;; + *) + libobj= + obj="$output" ;; esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg=$nonopt - fi - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest=$arg - continue - fi + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # reload_cmds runs $LD directly, so let us get rid of + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. + wl= - case $arg in - -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else - dest=$arg - continue + gentop="$output_objdir/${obj}x" + generated="$generated $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" fi - ;; - esac + fi - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + output="$obj" + func_execute_cmds "$reload_cmds" 'exit $?' - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 + exit $EXIT_SUCCESS fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + fi - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + if test -n "$pic_flag" || test "$pic_mode" != default; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" + func_execute_cmds "$reload_cmds" 'exit $?' fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS ;; - esac - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for programs" - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do + test -n "$release" && \ + func_warning "\`-release' is ignored for programs" - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" + test "$preload" = yes \ + && test "$dlopen_support" = unknown \ + && test "$dlopen_self" = unknown \ + && test "$dlopen_self_static" = unknown && \ + func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; + esac - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + case $host in + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). + if test "$tagname" = CXX ; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" + ;; + esac fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; esac - fi + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $EXIT_FAILURE - fi + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac + done + fi - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi else - relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` + eval flag=\"$hardcode_libdir_flag_spec\" + rpath="$rpath $flag" fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) dllsearchpath="$dllsearchpath:$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE + eval flag=\"$hardcode_libdir_flag_spec\" + rpath="$rpath $flag" fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + esac fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. + compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + fi - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi + wrappers_required=yes + case $host in + *cygwin* | *mingw* ) + if test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + *cegcc) + # Disable wrappers for cegcc, we are cross compiling anyway. + wrappers_required=no + ;; + *) + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + esac + if test "$wrappers_required" = no; then + # Replace the output file specification. + compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' - exit $lt_exit - } - done - IFS="$save_ifs" + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' fi - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; + exit $exit_status + fi - *.lo) - # Install (i.e. copy) a libtool object. + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + rpath="$rpath$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi + fi - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi + if test "$no_install" = yes; then + # We don't need to create a wrapper script. + link_command="$compile_var$compile_command$compile_rpath" + # Replace the output file specification. + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' exit $EXIT_SUCCESS - ;; + fi - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "\`$output' will be relinked during installation" + else + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then + relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= + fi else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" fi + fi - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi + # Replace the output file specification. + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac + func_show_eval "$link_command" 'exit $?' - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + # Now create the wrapper script. + func_verbose "creating $output" - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi - fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; + # Quote $ECHO for shipping. + if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` + else + qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + fi + + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done + case $host in + *cygwin* | *mingw* ) + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host" ; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - # Set up the ranlib parameters. - oldlib="$destdir/$name" + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do - if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save $symfileobj" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" + build_libtool_libs=no + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then + oldobjs="$oldobjs $symfileobj" + fi + fi + addlibs="$old_convenience" fi - # Do each command in the postinstall commands. - cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi + func_extract_archives $gentop $addlibs + oldobjs="$oldobjs $func_extract_archives_result" + fi - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + cmds=$old_archive_from_new_cmds + else - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done + func_extract_archives $gentop $dlprefiles + oldobjs="$oldobjs $func_extract_archives_result" + fi - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $ECHO "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase="$func_basename_result" + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" + ;; + *) oldobjs="$oldobjs $obj" ;; + esac done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS + eval cmds=\"$old_archive_cmds\" - $echo "X----------------------------------------------------------------------" | $Xsed - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj" ; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' done - $echo - $echo "If you ever happen to want to link against installed libraries" - $echo "in a given directory, LIBDIR, you must either use libtool, and" - $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - $echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - $echo " during execution" - fi - if test -n "$runpath_var"; then - $echo " - add LIBDIR to the \`$runpath_var' environment variable" - $echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $echo - $echo "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi + test -n "$generated" && \ + func_show_eval "${RM}r$generated" - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" + func_verbose "creating $output" - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" fi + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi - # Read the libtool library. - dlname= - library_names= + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do + if test "$installed" = yes; then + if test -z "$install_libdir"; then + break + fi + output="$output_objdir/$outputname"i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + newdependency_libs="$newdependency_libs $libdir/$name" + ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" + newdlfiles= + + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + newdlfiles="$newdlfiles $libdir/$name" + ;; + *) newdlfiles="$newdlfiles $lib" ;; + esac + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" + name="$func_basename_result" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + newdlprefiles="$newdlprefiles $libdir/$name" + ;; + esac + done + dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlfiles="$newdlfiles $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlprefiles="$newdlprefiles $abs" + done + dlprefiles="$newdlprefiles" + fi + $RM $output + # place dlname in correct position for cygwin + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac +# The name that we can dlopen(3). +dlname='$tdlname' - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi +# Names of this library. +library_names='$library_names' - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. +# The name of the static archive. +old_library='$old_library' - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - if test ! -f "$dir/$dlname"; then - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - fi - ;; +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" +# Version information for $libname. +current=$current +age=$age +revision=$revision - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done +# Is this an already installed library? +installed=$installed - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" +# Should we warn about portability when linking against -modules? +shouldnotlink=$module - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - fi" - done +{ test "$mode" = link || test "$mode" = relink; } && + func_mode_link ${1+"$@"} - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit $EXIT_SUCCESS - fi - ;; - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $opt_debug + RM="$nonopt" files= rmforce= exit_status=0 @@ -6547,30 +8209,28 @@ for arg do case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; + -f) RM="$RM $arg"; rmforce=yes ;; + -*) RM="$RM $arg" ;; *) files="$files $arg" ;; esac done - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" rmdirs= origobjdir="$objdir" for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then objdir="$origobjdir" else objdir="$dir/$origobjdir" fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + func_basename "$file" + name="$func_basename_result" test "$mode" = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates @@ -6582,9 +8242,9 @@ fi # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then : elif test -d "$file"; then exit_status=1 @@ -6598,8 +8258,8 @@ case $name in *.la) # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name + if func_lalib_p "$file"; then + func_source $dir/$name # Delete the libtool libraries and symlinks. for n in $library_names; do @@ -6614,39 +8274,17 @@ *" $dlname "*) ;; *) rmfiles="$rmfiles $objdir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ;; uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" + func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" + func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -6656,20 +8294,20 @@ *.lo) # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + if func_lalib_p "$file"; then # Read the .lo file - . $dir/$name + func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then + if test -n "$pic_object" && + test "$pic_object" != none; then rmfiles="$rmfiles $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" \ - && test "$non_pic_object" != none; then + if test -n "$non_pic_object" && + test "$non_pic_object" != none; then rmfiles="$rmfiles $dir/$non_pic_object" fi fi @@ -6680,17 +8318,26 @@ noexename=$name case $file in *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe rmfiles="$rmfiles $file" ;; esac # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles @@ -6705,239 +8352,38 @@ fi ;; esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 + func_show_eval "$RM $rmfiles" 'exit_status=1' done objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 + func_show_eval "rmdir $dir >/dev/null 2>&1" fi done exit $exit_status - ;; +} - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac +{ test "$mode" = uninstall || test "$mode" = clean; } && + func_mode_uninstall ${1+"$@"} - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" +test -z "$mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode \`$mode'" if test -n "$exec_cmd"; then - eval exec $exec_cmd + eval exec "$exec_cmd" exit $EXIT_FAILURE fi -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - - --config show all configuration variables - --debug enable verbose shell tracing --n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. +exit $exit_status -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $? # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting @@ -6951,14 +8397,17 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared +build_libtool_libs=no +build_old_libs=yes # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script # sh-indentation:2 # End: +# vi:sw=2 + diff -Nru /tmp/H5qKeNSrz8/geany-0.17/Makefile.am /tmp/ssBwSf4GIv/geany-0.18/Makefile.am --- geany-0.17/Makefile.am 2009-02-15 14:06:12.000000000 +0000 +++ geany-0.18/Makefile.am 2009-05-26 21:45:36.000000000 +0100 @@ -52,15 +52,9 @@ uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir); - rm -f $(DESTDIR)$(datadir)/pixmaps/geany.png; - rm -f $(DESTDIR)$(datadir)/pixmaps/geany.ico; install-data-local: @$(NORMAL_INSTALL) - if test -d $(srcdir)/pixmaps; then \ - $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \ - $(INSTALL_DATA) $(srcdir)/pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \ - fi $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/c99.tags $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \ @@ -75,15 +69,6 @@ fi \ done -dist-hook: - if test -d pixmaps; then \ - mkdir $(distdir)/pixmaps; \ - for pixmap in $(srcdir)/pixmaps/*; do \ - if test -f $$pixmap; then \ - cp -p $$pixmap $(distdir)/pixmaps; \ - fi \ - done \ - fi BZIP2_ENV =--best @@ -105,8 +90,6 @@ rpmbuild -ta $(distdir).tar.gz -logodir = $(datadir)/pixmaps - pkgconfig_DATA = geany.pc pkgconfigdir = $(libdir)/pkgconfig diff -Nru /tmp/H5qKeNSrz8/geany-0.17/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/Makefile.in --- geany-0.17/Makefile.in 2009-05-02 18:50:13.000000000 +0100 +++ geany-0.18/Makefile.in 2009-08-16 18:29:21.000000000 +0100 @@ -108,16 +108,14 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GEANY_DATA_DIR = @GEANY_DATA_DIR@ -GEANY_PIXMAPS_DIR = @GEANY_PIXMAPS_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -137,10 +135,12 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -149,13 +149,18 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -177,7 +182,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -208,6 +213,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -272,7 +278,6 @@ intltool-update BZIP2_ENV = --best -logodir = $(datadir)/pixmaps pkgconfig_DATA = geany.pc pkgconfigdir = $(libdir)/pkgconfig desktopdir = $(datadir)/applications @@ -555,9 +560,6 @@ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -756,34 +758,27 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-desktopDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-desktopDATA uninstall-local \ - uninstall-pkgconfigDATA + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local \ + install-desktopDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkgconfigDATA install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-desktopDATA uninstall-local uninstall-pkgconfigDATA uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir); - rm -f $(DESTDIR)$(datadir)/pixmaps/geany.png; - rm -f $(DESTDIR)$(datadir)/pixmaps/geany.ico; install-data-local: @$(NORMAL_INSTALL) - if test -d $(srcdir)/pixmaps; then \ - $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \ - $(INSTALL_DATA) $(srcdir)/pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \ - fi $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/c99.tags $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \ @@ -798,16 +793,6 @@ fi \ done -dist-hook: - if test -d pixmaps; then \ - mkdir $(distdir)/pixmaps; \ - for pixmap in $(srcdir)/pixmaps/*; do \ - if test -f $$pixmap; then \ - cp -p $$pixmap $(distdir)/pixmaps; \ - fi \ - done \ - fi - dist-bzip2: distdir BZIP2=$(BZIP2_ENV) $(AMTAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir) -rm -rf $(distdir) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/NEWS /tmp/ssBwSf4GIv/geany-0.18/NEWS --- geany-0.17/NEWS 2009-05-02 18:46:15.000000000 +0100 +++ geany-0.18/NEWS 2009-08-16 17:25:56.000000000 +0100 @@ -1,3 +1,96 @@ +Geany 0.18 (August 16, 2009) + + General: + * Fix scrolling horizontally after finding a search match with the + search bar or Find Next/Previous which is off-screen. + * Remove relative/untidy path elements from filenames when opening + documents (#2823998). + * Create initial template files with proper platform-specific line + ending characters. + * Improve inserting of comment templates like File header or licence + notices. + + Interface: + * Add 'Show Paths' documents list popup item. + * Add filetypes.common to 'Configuration Files' menu. + * Implement a graphical toolbar editor. + * Add 'Build' toolbar button to the default layout. + * Add 'Replace' toolbar button (closes #2798225). + * Use a more Tango like icon for 'Save All' (by Jesse Mayes, thanks). + * Add a popup menu for the keybinding list in the preferences dialog + to easily expand and collapse all groups. + + Keybindings: + * Implement Most-Recently-Used document switching when pressing + 'Switch to last used document' keybinding (Ctrl-Tab). + * Add 'Mark All' keybinding (Ctrl-Shift-M). + * Add 'Reflow lines/block' keybinding, (Ctrl-J; thanks to + Eugene Arshinov). + * Make the Scintilla keybindings 'Delete to end of line' and + 'Go to end of display line' configurable. + * Switching notebook tabs now works for the currently used notebook + widget instead of always using the documents notebook. + + Editor: + * Fix a redraw when documents were first drawn uncolourised. + * Delay highlighting matching braces by 100ms to speed up scrolling + with the arrow keys. + * Support 'tab indents, space aligns' style when indenting (#2789109). + * Add 'Autocomplete all words in document' pref; also used when forcing + autocompletion and there's no symbol names to show. + * Add 'Drop rest of word on completion' pref. + * Update Scintilla to version 1.79. + * Improve displaying and reshowing of calltips. + + Syntax highlighting: + * Reload color schemes via Tools menu (thanks to Eugene Arshinov). + * Implement named styles support for filetypes.* using a + filetypes.common [named_styles] section; used as + "style=named_style,bold". (See the manual for details). + * Allow style definitions with missing fields to use the + filetypes.common default style's fields. + * Make C-like filetype styles use named styles & default background + color. (Anyone who wants to likewise update any other filetype's + styles, please let us know ;-)). + * Allow indentation of wrapped lines (see style 'line_wrap_indent'). + * Add new styles 'line_height' and 'marker_mark'. + + Filetypes: + * Add Markdown filetype (thanks to Jon Strait). + * Highlight D WYSIWYG backtick `strings` and r"strings" (#1895745). + * Minor improvements for filetypes: Fortran, Haxe, HTML, Lua, + Matlab, Pascal, Python, Tcl + + Tags: + * Read custom system global tags files from $prefix/share/geany/tags + (#2778923). + * Autocomplete scoped fields like struct members when typing '.' (and + also '->' or '::' in C/C++) if the language's tag parser supports it. + * Save field tags for C/C++ when generating a global tags file (you may + want to regenerate your tag files). + * Parse Python calltips. + * Show relative paths in Diff filename tags. + * Group reStructuredText symbol list items by scope level. + + Plugin API: + * Add geanyplugin.h single include. + * Add plugin_signal_connect() for connecting plugin signals at + runtime and also for connecting to any GObject signal. + * Add documents_foreach(), filetypes[], documents[], utils_strdupa() + and various foreach_type() macros. + * Make GeanyDocument::file_type always be non-NULL. + + Windows: + * Fix quoting the build command string on Windows (closes #2791769). + * Fix LaTeX view commands on Windows (part of #2807688). + * Expand system environment variables (%variableName%) on Windows when + running Build commands. + + Internationalisation: + * Added translations: lb, sl, pt_PT + * Updated translations: ca, cs, de, en_GB, fi, fr, ja, pt_BR, ru, tr + + Geany 0.17 (May 02, 2009) Bug fixes: @@ -299,7 +392,7 @@ * Add translucency settings to filetypes.common for semi-transparency. * Add HTML parser to get h1, h2, h3 symbols as well as link anchors and JavaScript functions (fixes #1896068). - * Update Javascript, TCL and Assembler parser. + * Update Javascript, Tcl and Assembler parser. Interface: * When closing a tab when using left-to-right tabs, focus the next @@ -613,7 +706,7 @@ Tab. * Add MimeType associatiations for: C++ header, Pascal, Perl, Python, httpd-PHP and XML files (thanks to Iñaki Rodriguez). - * Add brace indenting support for Perl and TCL. + * Add brace indenting support for Perl and Tcl. * Make backspace unindent when using spaces for indentation. * Wrap notebook pages when switching tabs. * Speed up loading multiple C-like files slightly. Binary files /tmp/H5qKeNSrz8/geany-0.17/pixmaps/geany.ico and /tmp/ssBwSf4GIv/geany-0.18/pixmaps/geany.ico differ Binary files /tmp/H5qKeNSrz8/geany-0.17/pixmaps/geany.png and /tmp/ssBwSf4GIv/geany-0.18/pixmaps/geany.png differ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/classbuilder.c /tmp/ssBwSf4GIv/geany-0.18/plugins/classbuilder.c --- geany-0.17/plugins/classbuilder.c 2009-03-13 09:59:58.000000000 +0000 +++ geany-0.18/plugins/classbuilder.c 2009-07-14 16:06:20.000000000 +0100 @@ -20,19 +20,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: classbuilder.c 3625 2009-03-13 09:59:58Z eht16 $ + * $Id: classbuilder.c 3966 2009-07-14 15:06:20Z ntrel $ */ /* Class Builder - creates source files containing a new class interface and definition. */ -#include "geany.h" -#include "plugindata.h" -#include "support.h" -#include "filetypes.h" -#include "document.h" -#include "editor.h" -#include "ui_utils.h" -#include "geanyfunctions.h" +#include "geanyplugin.h" GeanyData *geany_data; @@ -197,7 +190,7 @@ /* The list must be ended with NULL as an extra check that arg_count is correct. */ static void -utils_free_pointers(gsize arg_count, ...) +free_pointers(gsize arg_count, ...) { va_list a; gsize i; @@ -598,7 +591,7 @@ } class_info->header = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->header_entry))); class_info->header_guard = g_ascii_strup(class_info->header, -1); - g_strdelimit(class_info->header_guard, ".", '_'); + g_strdelimit(class_info->header_guard, ".-", '_'); switch (class_info->type) { case GEANY_CLASS_TYPE_CPP: @@ -716,7 +709,7 @@ g_free(text); } - utils_free_pointers(17, tmp, class_info->class_name, class_info->class_name_up, + free_pointers(17, tmp, class_info->class_name, class_info->class_name_up, class_info->base_name, class_info->class_name_low, class_info->base_include, class_info->header, class_info->header_guard, class_info->source, class_info->base_decl, class_info->constructor_decl, class_info->constructor_impl, diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/demoplugin.c /tmp/ssBwSf4GIv/geany-0.18/plugins/demoplugin.c --- geany-0.17/plugins/demoplugin.c 2009-01-28 17:55:58.000000000 +0000 +++ geany-0.18/plugins/demoplugin.c 2009-07-14 16:06:20.000000000 +0100 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: demoplugin.c 3522 2009-01-28 17:55:58Z eht16 $ + * $Id: demoplugin.c 3966 2009-07-14 15:06:20Z ntrel $ */ /** @@ -35,18 +35,9 @@ */ -#include "geany.h" /* for the GeanyApp data type */ -#include "support.h" /* for the _() translation macro (see also po/POTFILES.in) */ -#include "editor.h" /* for the declaration of the GeanyEditor struct, not strictly necessary - as it will be also included by plugindata.h */ -#include "document.h" /* for the declaration of the GeanyDocument struct */ -#include "ui_utils.h" +#include "geanyplugin.h" /* plugin API, always comes first */ #include "Scintilla.h" /* for the SCNotification struct */ -#include "plugindata.h" /* this defines the plugin API */ -#include "geanyfunctions.h" /* this wraps geany_functions function pointers */ - - /* These items are set by Geany before plugin_init() is called. */ GeanyPlugin *geany_plugin; @@ -54,9 +45,9 @@ GeanyFunctions *geany_functions; -/* Check that the running Geany supports the plugin API used below, and check +/* Check that the running Geany supports the plugin API version used below, and check * for binary compatibility. */ -PLUGIN_VERSION_CHECK(112) +PLUGIN_VERSION_CHECK(147) /* All plugins must set name, description, version and author. */ PLUGIN_SET_INFO(_("Demo"), _("Example plugin."), VERSION, _("The Geany developer team")) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/export.c /tmp/ssBwSf4GIv/geany-0.18/plugins/export.c --- geany-0.17/plugins/export.c 2009-03-05 13:03:51.000000000 +0000 +++ geany-0.18/plugins/export.c 2009-07-14 16:06:20.000000000 +0100 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: export.c 3621 2009-03-05 13:03:51Z eht16 $ + * $Id: export.c 3966 2009-07-14 15:06:20Z ntrel $ */ /* Export plugin. */ @@ -27,15 +27,7 @@ #include #include -#include "geany.h" -#include "support.h" -#include "plugindata.h" -#include "editor.h" -#include "document.h" -#include "prefs.h" -#include "utils.h" -#include "ui_utils.h" -#include "geanyfunctions.h" +#include "geanyplugin.h" GeanyData *geany_data; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/filebrowser.c /tmp/ssBwSf4GIv/geany-0.18/plugins/filebrowser.c --- geany-0.17/plugins/filebrowser.c 2009-04-24 20:31:23.000000000 +0100 +++ geany-0.18/plugins/filebrowser.c 2009-07-29 18:40:20.000000000 +0100 @@ -19,28 +19,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: filebrowser.c 3733 2009-04-24 19:31:23Z eht16 $ + * $Id: filebrowser.c 4041 2009-07-29 17:40:20Z ntrel $ */ /* Sidebar file browser plugin. */ -#include "geany.h" +#include "geanyplugin.h" #include #include -#include "support.h" -#include "prefs.h" -#include "document.h" -#include "utils.h" -#include "keybindings.h" -#include "project.h" -#include "ui_utils.h" - -#include "plugindata.h" -#include "geanyfunctions.h" - +GeanyPlugin *geany_plugin; GeanyData *geany_data; GeanyFunctions *geany_functions; @@ -98,12 +88,10 @@ } popup_items; -static void document_activate_cb(GObject *obj, GeanyDocument *doc, gpointer data); static void project_change_cb(GObject *obj, GKeyFile *config, gpointer data); PluginCallback plugin_callbacks[] = { - { "document-activate", (GCallback) &document_activate_cb, TRUE, NULL }, { "project-open", (GCallback) &project_change_cb, TRUE, NULL }, { "project-save", (GCallback) &project_change_cb, TRUE, NULL }, { NULL, NULL, FALSE, NULL } @@ -168,13 +156,11 @@ if (! show_hidden_files && check_hidden(name)) return; - if (check_filtered(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); utf8_fullname = utils_get_locale_from_utf8(fname); + utf8_name = utils_get_utf8_from_locale(name); g_free(fname); if (dir) @@ -189,9 +175,16 @@ last_dir_iter = gtk_tree_iter_copy(&iter); } else + { + if (check_filtered(utf8_name)) + { + g_free(utf8_name); + g_free(utf8_fullname); + return; + } gtk_list_store_append(file_store, &iter); + } - utf8_name = utils_get_utf8_from_locale(name); gtk_list_store_set(file_store, &iter, FILEVIEW_COLUMN_ICON, (dir) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, @@ -274,6 +267,7 @@ } +/* TODO: use utils_get_default_dir_utf8() */ static gchar *get_default_dir(void) { const gchar *dir = NULL; @@ -1025,6 +1019,9 @@ 0, 0, "focus_file_list", _("Focus File List"), NULL); keybindings_set_item(plugin_key_group, KB_FOCUS_PATH_ENTRY, kb_activate, 0, 0, "focus_path_entry", _("Focus Path Entry"), NULL); + + plugin_signal_connect(geany_plugin, NULL, "document-activate", TRUE, + (GCallback) &document_activate_cb, NULL); } @@ -1128,7 +1125,7 @@ gtk_box_pack_start(GTK_BOX(vbox), checkbox_fp, FALSE, FALSE, 5); pref_widgets.follow_path_checkbox = checkbox_fp; - checkbox_pb = gtk_check_button_new_with_label(_("Set the project's base directory")); + checkbox_pb = gtk_check_button_new_with_label(_("Use the project's base directory")); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_pb), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_pb), fb_set_project_base_path); ui_widget_set_tooltip_text(checkbox_pb, diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/geanyfunctions.h /tmp/ssBwSf4GIv/geany-0.18/plugins/geanyfunctions.h --- geany-0.17/plugins/geanyfunctions.h 2009-05-02 18:51:55.000000000 +0100 +++ geany-0.18/plugins/geanyfunctions.h 2009-08-16 18:29:38.000000000 +0100 @@ -3,6 +3,8 @@ * @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. */ #ifndef GEANY_FUNCTIONS_H @@ -12,6 +14,8 @@ geany_functions->p_plugin->add_toolbar_item #define plugin_module_make_resident \ geany_functions->p_plugin->module_make_resident +#define plugin_signal_connect \ + geany_functions->p_plugin->signal_connect #define document_new_file \ geany_functions->p_document->new_file #define document_get_current \ @@ -146,6 +150,8 @@ geany_functions->p_sci->get_contents_range #define sci_get_selection_contents \ geany_functions->p_sci->get_selection_contents +#define sci_set_font \ + geany_functions->p_sci->set_font #define templates_get_template_fileheader \ geany_functions->p_templates->get_template_fileheader #define utils_str_equal \ @@ -184,6 +190,8 @@ geany_functions->p_utils->string_replace_first #define utils_str_middle_truncate \ geany_functions->p_utils->str_middle_truncate +#define utils_str_remove_chars \ + geany_functions->p_utils->str_remove_chars #define ui_dialog_vbox_new \ geany_functions->p_ui->dialog_vbox_new #define ui_frame_new_with_alignment \ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/geanyplugin.h /tmp/ssBwSf4GIv/geany-0.18/plugins/geanyplugin.h --- geany-0.17/plugins/geanyplugin.h 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/plugins/geanyplugin.h 2009-07-14 16:06:20.000000000 +0100 @@ -0,0 +1,59 @@ +/* + * geanyplugin.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2009 Enrico Tröger + * Copyright 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: geanyplugin.h 3966 2009-07-14 15:06:20Z ntrel $ + */ + +/** + * @file geanyplugin.h + * Single include for plugins. + **/ + + +#ifndef GEANY_PLUGIN_H +#define GEANY_PLUGIN_H 1 + +#include "geany.h" +#include "plugindata.h" + +#include "dialogs.h" +#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 "support.h" +#include "templates.h" +#include "toolbar.h" +#include "ui_utils.h" +#include "utils.h" + +#include "geanyfunctions.h" + +#endif diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/genapi.py /tmp/ssBwSf4GIv/geany-0.18/plugins/genapi.py --- geany-0.17/plugins/genapi.py 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.18/plugins/genapi.py 2009-07-14 14:26:19.000000000 +0100 @@ -55,6 +55,20 @@ return 'p_' + m.group(1), m.group(2) +header = \ +'''/* 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. + * You need to declare the @ref geany_functions symbol yourself. + * + * Note: This must be included after all other API headers. + */ + +#ifndef GEANY_FUNCTIONS_H +#define GEANY_FUNCTIONS_H +''' + if __name__ == "__main__": outfile = 'geanyfunctions.h' @@ -63,15 +77,12 @@ sys.exit("No function names read!") f = open(outfile, 'w') - print >>f, '/* This file is generated automatically by genapi.py - do not edit.\n *\n' +\ - ' * @file %s @ref geany_functions wrappers.\n' % (outfile) +\ - ' * This allows the use of normal API function names in plugins.\n' +\ - ' * You need to declare the @ref geany_functions symbol yourself.\n */\n' - print >>f, '#ifndef GEANY_FUNCTIONS_H' - print >>f, '#define GEANY_FUNCTIONS_H\n' + 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) + print >>f, '\n#endif' f.close diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/htmlchars.c /tmp/ssBwSf4GIv/geany-0.18/plugins/htmlchars.c --- geany-0.17/plugins/htmlchars.c 2009-04-03 15:23:45.000000000 +0100 +++ geany-0.18/plugins/htmlchars.c 2009-07-14 16:06:20.000000000 +0100 @@ -20,23 +20,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: htmlchars.c 3681 2009-04-03 14:23:45Z ntrel $ + * $Id: htmlchars.c 3966 2009-07-14 15:06:20Z ntrel $ */ /* HTML Characters plugin (Inserts HTML character entities like '&') */ -#include "geany.h" +#include "geanyplugin.h" #include -#include "support.h" -#include "plugindata.h" -#include "document.h" -#include "editor.h" -#include "keybindings.h" -#include "ui_utils.h" -#include "utils.h" -#include "geanyfunctions.h" - GeanyData *geany_data; GeanyFunctions *geany_functions; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/Makefile.am /tmp/ssBwSf4GIv/geany-0.18/plugins/Makefile.am --- geany-0.17/plugins/Makefile.am 2009-02-26 01:25:38.000000000 +0000 +++ geany-0.18/plugins/Makefile.am 2009-07-14 16:06:20.000000000 +0100 @@ -2,8 +2,6 @@ EXTRA_DIST = \ makefile.win32 \ - pluginmacros.h \ - geanyfunctions.h \ genapi.py plugindir = $(libdir)/geany @@ -11,6 +9,7 @@ plugins_includedir = $(includedir)/geany plugins_include_HEADERS = \ pluginmacros.h \ + geanyplugin.h \ geanyfunctions.h # systems without python should continue to build OK diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/plugins/Makefile.in --- geany-0.17/plugins/Makefile.in 2009-05-02 18:50:13.000000000 +0100 +++ geany-0.18/plugins/Makefile.in 2009-08-16 18:29:21.000000000 +0100 @@ -176,16 +176,14 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GEANY_DATA_DIR = @GEANY_DATA_DIR@ -GEANY_PIXMAPS_DIR = @GEANY_PIXMAPS_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -205,10 +203,12 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -217,13 +217,18 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -245,7 +250,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -276,6 +281,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -293,14 +299,13 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ makefile.win32 \ - pluginmacros.h \ - geanyfunctions.h \ genapi.py plugindir = $(libdir)/geany plugins_includedir = $(includedir)/geany plugins_include_HEADERS = \ pluginmacros.h \ + geanyplugin.h \ geanyfunctions.h demoplugin_la_LDFLAGS = -module -avoid-version diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/saveactions.c /tmp/ssBwSf4GIv/geany-0.18/plugins/saveactions.c --- geany-0.17/plugins/saveactions.c 2009-04-03 15:23:45.000000000 +0100 +++ geany-0.18/plugins/saveactions.c 2009-07-14 16:06:20.000000000 +0100 @@ -19,19 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: saveactions.c 3681 2009-04-03 14:23:45Z ntrel $ + * $Id: saveactions.c 3966 2009-07-14 15:06:20Z ntrel $ */ -#include "geany.h" -#include "support.h" -#include "document.h" -#include "utils.h" -#include "ui_utils.h" -#include "filetypes.h" - -#include "plugindata.h" -#include "geanyfunctions.h" +#include "geanyplugin.h" #include #include @@ -42,7 +34,7 @@ GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(98) +PLUGIN_VERSION_CHECK(GEANY_API_VERSION) PLUGIN_SET_INFO(_("Save Actions"), _("This plugin provides different actions related to saving of files."), VERSION, _("The Geany developer team")) @@ -353,7 +345,7 @@ config, "saveactions", "enable_backupcopy", FALSE); instantsave_default_ft = utils_get_setting_string(config, "instantsave", "default_ft", - filetypes_index(GEANY_FILETYPES_NONE)->name); + filetypes[GEANY_FILETYPES_NONE]->name); autosave_src_id = G_MAXUINT; /* mark as invalid */ autosave_interval = utils_get_setting_integer(config, "autosave", "interval", 300); @@ -604,7 +596,6 @@ GtkWidget *combo; guint i; GSList *node; - GeanyFiletype *ft; notebook_vbox = gtk_vbox_new(FALSE, 2); inner_vbox = gtk_vbox_new(FALSE, 5); @@ -627,8 +618,10 @@ pref_widgets.instantsave_ft_combo = combo = gtk_combo_box_new_text(); i = 0; - foreach_slist(ft, node, geany->filetypes_by_title) + foreach_slist(node, geany->filetypes_by_title) { + GeanyFiletype *ft = node->data; + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), ft->name); if (utils_str_equal(ft->name, instantsave_default_ft)) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/plugins/splitwindow.c /tmp/ssBwSf4GIv/geany-0.18/plugins/splitwindow.c --- geany-0.17/plugins/splitwindow.c 2009-03-19 17:50:38.000000000 +0000 +++ geany-0.18/plugins/splitwindow.c 2009-07-23 12:00:32.000000000 +0100 @@ -19,28 +19,22 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. * - * $Id: splitwindow.c 3637 2009-03-19 17:50:38Z eht16 $ + * $Id: splitwindow.c 4012 2009-07-23 11:00:32Z ntrel $ */ /* Split Window plugin. */ -#include "geany.h" -#include "support.h" +#include "geanyplugin.h" +#include + #include "Scintilla.h" #include "ScintillaWidget.h" #include "SciLexer.h" -#include "ui_utils.h" -#include "document.h" -#include "editor.h" -#include "plugindata.h" -#include "keybindings.h" -#include "geanyfunctions.h" - PLUGIN_VERSION_CHECK(GEANY_API_VERSION) PLUGIN_SET_INFO(_("Split Window"), _("Splits the editor view into two windows."), - "0.1", _("The Geany developer team")) + VERSION, _("The Geany developer team")) GeanyData *geany_data; @@ -120,14 +114,6 @@ } -static void sci_set_font(ScintillaObject *sci, gint style, const gchar *font, - gint size) -{ - scintilla_send_message(sci, SCI_STYLESETFONT, style, (sptr_t) font); - scintilla_send_message(sci, SCI_STYLESETSIZE, style, size); -} - - static void update_font(ScintillaObject *current, ScintillaObject *sci) { gint style_id; @@ -225,14 +211,44 @@ } -static GtkWidget *create_tool_button(const gchar *label, const gchar *stock_id) +static const gchar *ui_get_stock_label(const gchar *stock_id) +{ + GtkStockItem item; + + if (gtk_stock_lookup(stock_id, &item)) + return item.label; + + g_warning("No stock id '%s'!", stock_id); + return ""; +} + + +/* Create a GtkToolButton with stock icon, label and tooltip. + * @param label can be NULL to use stock label text. @a label can contain underscores, + * which will be removed. + * @param tooltip can be NULL to use label text (useful for GTK_TOOLBAR_ICONS). */ +static GtkWidget *ui_tool_button_new(const gchar *stock_id, const gchar *label, const gchar *tooltip) { GtkToolItem *item; + gchar *dup = NULL; + + if (stock_id && !label) + { + label = ui_get_stock_label(stock_id); + } + dup = utils_str_remove_chars(g_strdup(label), "_"); + label = dup; item = gtk_tool_button_new(NULL, label); - gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), stock_id); - ui_widget_set_tooltip_text(GTK_WIDGET(item), label); + if (stock_id) + gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(item), stock_id); + + if (!tooltip) + tooltip = label; + if (tooltip) + ui_widget_set_tooltip_text(GTK_WIDGET(item), tooltip); + g_free(dup); return GTK_WIDGET(item); } @@ -248,18 +264,6 @@ } -/* avoid adding new strings which are the same but without a leading underscore */ -static const gchar *after_underscore(const gchar *str) -{ - const gchar *u = g_strstr_len(str, -1, "_"); - - if (u) - return ++u; - else - return str; -} - - static GtkWidget *create_toolbar(void) { GtkWidget *toolbar, *item; @@ -269,7 +273,8 @@ gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_MENU); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); - item = (GtkWidget*)gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH); + item = ui_tool_button_new(GTK_STOCK_JUMP_TO, "", + _("Show the current document")); gtk_container_add(GTK_CONTAINER(toolbar), item); g_signal_connect(item, "clicked", G_CALLBACK(on_refresh), NULL); @@ -282,7 +287,7 @@ gtk_container_add(GTK_CONTAINER(tool_item), item); edit_window.name_label = item; - item = create_tool_button(after_underscore(_("_Unsplit")), GTK_STOCK_CLOSE); + item = ui_tool_button_new(GTK_STOCK_CLOSE, _("_Unsplit"), NULL); gtk_container_add(GTK_CONTAINER(toolbar), item); g_signal_connect(item, "clicked", G_CALLBACK(on_unsplit), NULL); @@ -392,7 +397,7 @@ GtkWidget *item, *menu; menu_items.main = item = gtk_menu_item_new_with_mnemonic(_("_Split Window")); - gtk_menu_append(geany_data->main_widgets->tools_menu, item); + gtk_menu_shell_append(GTK_MENU_SHELL(geany_data->main_widgets->tools_menu), item); ui_add_document_sensitive(item); menu = gtk_menu_new(); @@ -401,17 +406,17 @@ menu_items.horizontal = item = gtk_menu_item_new_with_mnemonic(_("_Horizontally")); g_signal_connect(item, "activate", G_CALLBACK(on_split_horizontally), NULL); - gtk_menu_append(menu, item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); menu_items.vertical = item = gtk_menu_item_new_with_mnemonic(_("_Vertically")); g_signal_connect(item, "activate", G_CALLBACK(on_split_vertically), NULL); - gtk_menu_append(menu, item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); menu_items.unsplit = item = gtk_menu_item_new_with_mnemonic(_("_Unsplit")); g_signal_connect(item, "activate", G_CALLBACK(on_unsplit), NULL); - gtk_menu_append(menu, item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_widget_show_all(menu_items.main); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/be.po /tmp/ssBwSf4GIv/geany-0.18/po/be.po --- geany-0.17/po/be.po 2009-05-01 16:56:22.000000000 +0100 +++ geany-0.18/po/be.po 2009-08-16 17:18:28.000000000 +0100 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.17\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-28 16:02+0300\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2009-05-01 21:30+0300\n" "Last-Translator: Yura Siamashka \n" "Language-Team: Belarusian \n" @@ -32,68 +32,68 @@ msgid "Integrated Development Environment" msgstr "Інтэграванае асяроддзе распрацоўкі" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Пра Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Хуткае і легкаважнае асяроддзе распрацоўкі" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(пабудавана %s або пазней)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Інфармацыя" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Распрацоўшчыкі" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "Вядучы распрацоўшчык" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "распрацоўшчык" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "падтрымка перакладу" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Перакладчыкі" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Былыя перакладчыкі" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Удзельнікі" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Некаторыя з шматлікіх удзельнікаў (больш дэталёвы спіс глядзі ў файле %s):" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Аўтары" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Ліцэнзія" -#: ../src/about.c:389 +#: ../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." @@ -101,7 +101,7 @@ "Тэкст ліцэнзіі не знойдзены, калі ласка наведаеце http://www.gnu.org/" "licenses/gpl-2.0.txt, каб азнаёміцца з ім." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -109,129 +109,129 @@ msgstr "" "Немагчыма знайсці тэрмінал '%s' (праверце шлях да тэрмінала ў уласцівасцях)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Памылка запуску \"%s\" (стартавы скрыпт не можа быць створаны)" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Працэс скончыўся непаспяхова (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (у дырэкторыі: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Не атрымалася змяніць працоўную дырэкторыю на \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "Немагчыма запусціць файл у VTE, бо ён, магчыма, утрымлівае каманду." -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Кампіляцыя скончылася непаспяхова." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Кампіляцыя скончылася паспяхова." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "Кампіляваць" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 msgid "_Build" msgstr "Пабудаваць" #. build the code with make all -#: ../src/build.c:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Будаваць аб'ект" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Наступная памылка" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Папярэдняя памылка" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "Усталяваць параметры зборкі" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "Праглядзець DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "Праглядзець PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "Усталяваць аргументы" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Усталяваць аргументы" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "Усталяваць праграмы і наладкі для зборкі і прагляду (La)TeX файлаў." -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Стварэнне DVI" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Стварэнне PDF" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Прагляд DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Прагляд PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -240,68 +240,68 @@ "%f будзе заменены на поўнае імя, напрыклад, test_file.c\n" "%e будзе заменены на імя файла без пашырэння, напрыклад, test_file" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Усталяваць параметры зборкі" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "сталяваць каманды для будоўлі і выканання праграм." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s каманды" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Кампіляваць:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Будаваць:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Выканаць:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Будаваць цяперашні файл" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Будаваць з make (свая мэта)" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Увядзіце тут свае наладкі, увесь уведзены тэкст перадаецца камандзе make." -#: ../src/build.c:1976 +#: ../src/build.c:1967 msgid "Build the current file with Make and the default target" msgstr "Будаваць цяперашні файл, выкарыстоўваючы make і мэту зборкі па змоўку" -#: ../src/build.c:1979 +#: ../src/build.c:1970 msgid "Build the current file with Make and the specified target" msgstr "Будаваць цяперашні файл, выкарыстоўваючы make і указаную мэту" -#: ../src/build.c:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Скампіляваць цяперашні файл, выкарыстоўваючы make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Немагчыма запусціць праграму прагляду" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Працэс немагчыма спыніць (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Памылак будоўлі больш няма." @@ -309,8 +309,8 @@ msgid "Do you really want to quit?" msgstr "Вы ўпэўнены, што жадаеце выйсці?" -#: ../src/callbacks.c:469 ../src/document.c:2902 ../src/interface.c:340 -#: ../src/treeviews.c:554 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "Загрузіць зноў" @@ -323,54 +323,54 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Вы упэўнены што жадаеце загрузіць зноў '%s?'" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Перайсці да радка" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Увядзіце радок, на які перайсці:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Калі ласка вызначыце тып файла для цяперашняга дакумента перад " "выкарыстоўваннем гэтай функцыі" -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "Выкарыстоўваць свой фармат даты" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Свой фармат даты" -#: ../src/callbacks.c:1495 +#: ../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." @@ -378,24 +378,24 @@ "Увядзіце свой фармат даты часу. Вы можаце выкарыстоўваць любыя параметры " "канверсіі, дастасавальныя да функцыі strftime ANSI C." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "Немагчыма пераўтварыць фармат даты (магчыма радок надта доўгі)." -#: ../src/callbacks.c:1767 ../src/callbacks.c:1777 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Паведамленняў больш няма." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Адчыніць файл" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Выгляд" -#: ../src/dialogs.c:150 +#: ../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." @@ -403,28 +403,28 @@ "Адчыніць файл ў рэжыме \"толькі чытанне\". Калі абраць больш за адзін файл, " "усе абраныя файлы будуць адчынены ў рэжыме \"толькі чытанне\"." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Вызначаць па пашырэнню файла" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Вызначаць па зместу файла" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "Дадатковыя наладкі" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Паказваць схаваныя файлы" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Усталяваць знаканабор:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -438,11 +438,11 @@ "знаканабору." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Усталюйце тып файла:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -453,23 +453,32 @@ "Увага: Калі Вы абралі некалькі файлаў, яны будуць адчынены з абраным тыпам " "файла." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "Замяніць" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Захаваць файл" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Пераназваць" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Захаваць і пераназваць файл" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "Адчыніць файл у новай укладцы" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -477,24 +486,41 @@ "Захаваць цяперашні незахаваны дакумент адчыненым, і адчыніць створаны файл у " "новай укладцы." -#: ../src/dialogs.c:622 +#: ../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 "Не захоўваць" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Файл '%s' не захаваны." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Захаваць файл да зачынення?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Абраць шрыфт" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -502,106 +528,106 @@ "Адбылася памылка або інфармацыя аб файле не можа быць атрымана (напрыклад, " "новы файл)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1668 ../src/symbols.c:1689 ../src/symbols.c:1741 -#: ../src/ui_utils.c:222 +#: ../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 "невядомы" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Уласцівасці" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Тып:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Памер:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Размяшчэнне:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Толькі чытанне:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(толькі ў Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Знаканабор:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(з BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(без BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Мадыфікаваны:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Зменены:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Апошні доступ:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Права доступу:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Чытаць:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Пісаць:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Уладальнік:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Група:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Іншыя:" -#: ../src/document.c:678 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Файл %s зачынены." -#: ../src/document.c:795 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Адчынены новы файл \"%s\"." -#: ../src/document.c:968 ../src/document.c:1474 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Немагчыма адчыніць файл %s (%s)" -#: ../src/document.c:998 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -616,12 +642,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1024 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файл \"%s\" не з'яўляецца сапраўдным %s." -#: ../src/document.c:1034 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -629,48 +655,51 @@ msgstr "" "Файл \"%s\" не выглядае як тэкст, альбо яго знаканабор не падтрымліваецца." -#: ../src/document.c:1172 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Прабелы" -#: ../src/document.c:1175 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Укладкі" -#: ../src/document.c:1178 +#: ../src/document.c:1128 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:1183 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Усталюецца %s рэжым фарматавання для %s." -#: ../src/document.c:1236 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Благі файл" -#: ../src/document.c:1356 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Файл %s загружаны зноў." -#: ../src/document.c:1358 +#. 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 "Файл %s адчынены (%d%s)." -#: ../src/document.c:1360 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", толькі чытаць" -#: ../src/document.c:1565 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Памылка пры перамяшчэнні файла." -#: ../src/document.c:1640 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -679,7 +708,7 @@ "Адбылася памылка пры пераўтварэнні фала з UTF-8 у \"%s\". Файл застанецца " "незахаваным." -#: ../src/document.c:1662 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -688,41 +717,41 @@ "Паведамленне памылкі: %s\n" "Памылка адбылася ў \"%s\" (радок %d, слупок: %d)." -#: ../src/document.c:1667 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Тэкст памылкі: (%s)." -#: ../src/document.c:1767 ../src/document.c:1827 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Памылка пры захаванні файла." -#: ../src/document.c:1826 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Памылка пры захаванні файла (%s)." -#: ../src/document.c:1851 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Файл %s захаваны." -#: ../src/document.c:1917 ../src/document.c:1974 ../src/document.c:1982 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" не знайдзён." -#: ../src/document.c:1982 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Шукаць зноў с пачатку?" -#: ../src/document.c:2061 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Супадзенні не знойдзены для \"%s\"." -#: ../src/document.c:2072 ../src/document.c:2081 +#: ../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\"." @@ -730,11 +759,11 @@ msgstr[1] "%s: зменена %d выпадкі \"%s\" на \"%s\"." msgstr[2] "%s: зменены %d выпадкаў \"%s\" на \"%s\"." -#: ../src/document.c:2903 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Вы жадаеце загрузіць яго зноў?" -#: ../src/document.c:2904 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -743,32 +772,20 @@ "Файл '%s' на дыску больш новы чым\n" "цяперашні буфер." -#: ../src/document.c:2925 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Паспрабаваць перазахаваць файл?" -#: ../src/document.c:2926 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Файл \"%s\" не знайдзён на дыску!" -#: ../src/editor.c:3859 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3860 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Max (CR)" - -#: ../src/editor.c:3861 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3985 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Увядзіце шырыню ўкладкі" -#: ../src/editor.c:3986 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Увядзіце колькасць прабелаў якая павінна быць зменена на літару адступ." @@ -870,133 +887,122 @@ msgstr "Кітайскі традыцыйны" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Японскі" -#: ../src/encodings.c:141 ../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 "Карэйскі" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Без знаканабору" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "Заходне Еўрапейскі" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "Усходне Еўрапейскі" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Усходне Азіяцкі" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "Паўднёва-Усходні і Паўднёва-Заходнні Азіяцкі" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "Сярэдні Усход" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "Юнікод" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Нічога" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s зыходны файл" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "%s зыходны файл" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Нічога" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "файл абалонкі" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML дакумэнт" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Файл каскаднай табліцы стыляў (CSS)" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Файл змяненняў" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "наладкі" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext файл перакладу" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s скрыпт файл" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStructuredText файл" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Мовы праграміравання" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Мовы скрыптоў" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Мовы разметкі" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Іншыя мовы" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Усе зыходныя" -#: ../src/filetypes.c:1309 ../src/project.c:292 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Усе файлы" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Дрэнны сталы выраз для файлаў тыпу %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "без назвы" @@ -1010,8 +1016,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "нябачна" @@ -1019,7 +1025,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Адчыніць вылучаны файл" @@ -1039,11 +1045,11 @@ msgid "Page Set_up" msgstr "Наладка старонкі" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Зачыніць іншыя дакументы" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Зачыніць усе" @@ -1051,83 +1057,79 @@ msgid "_Edit" msgstr "Змена" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Вылучыць усё" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "Фармат" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Пераключыць рэгістр у вылучэнні" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "Каментаваць радок" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Раскаментаваць радок" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Каментаваць/Раскаментаваць радок" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "Дубліраваць радок ці вылучэнне" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Павялічыць адступ" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Зменшыць адступ" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "Паслаць вылучэнне ў тэрмінал" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "Паслаць вылучэнне да" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Уставіць каментарый" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Уставіць ChangeLog запіс" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Уставіць загаловак файла" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Уставіць апісанне функцыі" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Уставіць шматрадковы каментарый" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Уставіць GPL паведамленне" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Уставіць BSD паведамленне" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Уставіць дату" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Уставіць \"include <...>\"" @@ -1151,7 +1153,7 @@ msgid "Find in F_iles" msgstr "Шукаць у файлах" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Замяніць" @@ -1171,7 +1173,7 @@ msgid "Pr_evious Message" msgstr "Былое паведамленне" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Ісці да радка" @@ -1199,7 +1201,7 @@ msgid "Show Side_bar" msgstr "Паказваць панель прыладаў" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Рэдактар" @@ -1243,15 +1245,15 @@ msgid "In_dent Type" msgstr "Тып водступу" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "Адступы" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "Прабелы" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "Адступы і прабелы" @@ -1371,7 +1373,7 @@ msgid "_Debug Messages" msgstr "Паведамленні адладкі" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Сімвалы" @@ -1395,71 +1397,77 @@ msgid "Scribble" msgstr "Для заметак" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Малюнкі і тэкст" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Толькі малюнкі" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Толькі тэкст" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Павялічаныя значкі" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Паменшаныя значкі" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "Вельмі малыя значкі" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" msgstr "Схаваць панель прыладаў" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "Схаваць панель прыладаў" + +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Знайсці выкарыстоўванне" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Знайсці выкарыстоўванне дакумента" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Перайсці да рэалізацыі" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Перайсці да аб'явы" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Кантэкставае дзеянне" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Уласцівасці" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Загрузіць файлы з апошняга сеансу" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Адчыняць файлы з апошняга сеансу пры старце" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Загружаць эмулятар тэрмінала" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1467,39 +1475,39 @@ "Ці трэба загружаць эмулятар тэрмінала (VTE) пры старце. Забараніце, калі ён " "не патрэбен. " -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Дазволіць падтрымку ўбудоў" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Запуск" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Захаваць пазіцыю вакон і геаметрыю" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "Захаваць пазіцыю вакон і геаметрыю, і аднаўляць яе пры старце" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Пацвярджаць выхад" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Паказваць пацвярджаючы дыялог пры выхадзе." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Завяршэнне" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Стартавая дырэкторыя:" -#: ../src/interface.c:2758 +#: ../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." @@ -1508,19 +1516,19 @@ "абсалютным шляхам. Пакіньце пустой для выкарыстоўвання цяперашней " "дырэкторыі. " -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Файлы праекта:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Стартавая дырэкторыя пры адкрыцці файлаў праекта" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Дадатковы шлях да ўбудоў:" -#: ../src/interface.c:2808 +#: ../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 " @@ -1529,39 +1537,39 @@ "Geany па змоўку шукае убудовы ў дырэкторыі інсталяцыі і наладак. Гэты шлях " "будзе дададзены для пошуку ўбудоў. Пакіньце пустым каб забараніць." -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Шляхі" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Запуск" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Гудок пры памылках, ці на завяршэнне кампіляцыі" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "Ці трэба гудзець пры памылцы, ці на завяршэнне кампіляцыі." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Пераключацца ў вакно паведамленняў, пры з'з'яўленні новага" -#: ../src/interface.c:2856 +#: ../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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Забараніць паведамленні статуса ў радку стану" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1569,11 +1577,12 @@ "Выдаліць усе паведамленні з радка стану. Паведамленні паказваюцца ў акне " "стану." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Аўта фокус віджэтаў (фокус ідзе за мышам)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1583,15 +1592,15 @@ "Працуе для галоўнага вакна рэдактара, VTE, пошуку і пераходу да радка на " "панелі прыладаў." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Іншае" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Заўсёды пракручваць пошук і хаваць дыялог пошуку" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1599,11 +1608,11 @@ "Заўсёды пракручваць пошук і хаваць дыялог пошуку пасля націскання Шукаць " "Наступны/Былы." -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "Выкарыстаць слова пад курсорам для дыялогаў пошуку" -#: ../src/interface.c:2896 +#: ../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" @@ -1612,19 +1621,19 @@ "курсорам, пры адчыненні дыялогаў \"Пошук\", \"Шукаць у файлах\" або " "\"\"Замяніць\"." -#: ../src/interface.c:2898 +#: ../src/interface.c:2918 msgid "Use the current file's directory for Find in Files" msgstr "Выкарыстоўваць цяперашнюю дырэкторыю для пошуку ў файлах" -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Шукаць" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Выкарыстоўваць файлы сесій праекта" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1632,11 +1641,11 @@ "Ці захоўваць спіс адчыненых файлаў у праекце і адчыняць іх пры адкрыцці " "праекта" -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Захоўваць файл праекта ў базавай дырэкторыі праекта" -#: ../src/interface.c:2929 +#: ../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 " @@ -1647,75 +1656,75 @@ "стварэнні новага праекта, замест дырэкторыі вышэй базавай дырэкторыі " "праекта. Вы можаце змяніць шлях да файла праекта ў дыялогу Новы Праект." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Праекты" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Разнастайнае" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Агульны" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Паказваць спіс сімвалаў" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Паказаць/Схаваць спіс сімвалаў" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Паказаць спіс дакументаў" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Паказаць/Схаваць спіс дакументаў" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Бакавая панель" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Спіс сімвалаў:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Акно паведамленняў:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Рэдактар:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Усталяваць шрыфт для вакна паведамленняў" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Усталяваць шрыфт для спісу сімвалаў" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Шрыфт рэдактара" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Шрыфты" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Паказваць закладкі рэдактара" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Паказваць зачыняючыя кнопкі" -#: ../src/interface.c:3064 +#: ../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)" @@ -1723,106 +1732,111 @@ "Паказваць маленькія кнопкі з крыжыкам, на ўкладках, побач з назвамі файлаў, " "каб можна было лёгка зачыняць іх адным пстрычкам (патрэбен перазапуск Geany)." -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Пазіцыя новых файлаў ў закладцы файлаў" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Улева" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "Новыя файлы будуць змешчаны злева у закладцы файлаў" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Справа" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "Новыя файлы будуць змешчаны справа у закладцы файлаў" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Падвоены клік хавае усе дадатковыя віджэты" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Перамкнуць усе дадатковыя віджэты" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Укладкі редактара тэкста" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Верх" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Ніз" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Бакавая панель:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Месца укладак" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Паказваць радок стану" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Ці паказваць радок стану ўнізе галоўнага вакна" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Інтэрфейс" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Паказваць панель прыладаў" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "Дадаць панель прылад да меню" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Далучыць панель прыладаў да меню каб захаваць больш вертыкальнага месца" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Панель прыладаў" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Стыль значкоў:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Памер значкоў:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Выгляд" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Паказваць панель прыладаў" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Панель прылад" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Перанос радкоў" -#: ../src/interface.c:3349 +#: ../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 " @@ -1832,11 +1846,11 @@ "радка. Увага: дынамічны перанос радкоў з'яўляецца рэсурсаёмістым працэсам " "пры працы з вялікімі дакументамі, таму на слабых машынах варта яго адключыць." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Дазволіць \"разумную\" клавішу home" -#: ../src/interface.c:3354 +#: ../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 " @@ -1849,11 +1863,11 @@ "на пачатак радка. Калі гэта ўласцівасць забаронена курсор заўсёды " "перамяшчаецца ў пачатак радка, незалежна ад цяперашняга палажэння." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Забараніць перацягванне" -#: ../src/interface.c:3359 +#: ../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" @@ -1861,19 +1875,19 @@ "Забараніць перацягванне увогуле, так, каб нельга было перацягваць вылучэнне " "ў акне рэдактара або за яго межамі" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Дазволіць згортванне блокаў кода" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Ці дазваляць згортванне блокаў кода" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Згарнуць/разгарнуць усе ўкладзеныя элементы" -#: ../src/interface.c:3369 +#: ../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." @@ -1881,11 +1895,11 @@ "Згарнуць ці разгарнуць усе ўкладзеныя элементы. Пры націску клавішы shift, " "выкарыстоўваецца адваротныя дзеянні." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Выкарыстоўваць індыкатары для памылак кампіляцыі" -#: ../src/interface.c:3374 +#: ../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" @@ -1893,23 +1907,23 @@ "Ці выкарыстоўваць індыкатары(падкрэсліванне) для пазначэння радка, калі " "кампілятар знойдзе у ім папярэджанне ці памылку" -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Выдаляць завяршаючыя прабелы " -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Убіраць завяршаючыя прабелы с былога радка пры стварэнні новага радка." -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Разбіваць радок па слупку:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "перамыкач маркёра каментарыяў:" -#: ../src/interface.c:3406 +#: ../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." @@ -1917,95 +1931,95 @@ "Тэкст, дабаўленне якога прывядзе да пераключэння рэжыму каментавання радкоў " "у зыходным файле." -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Магчымасці" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Магчымасці" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Рэжым аўта-водступу:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Базавы" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Цяперашнія літары" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Парныя дужкі" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Тып:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Шырыня:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "Шырыня ў літарах аднаго адступа" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Выкарыстоўваць прабелы для адступаў" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Выкарыстоўваць адзін адступ" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" "Выкарыстоўваць прабелы калі агульная шырыня адступа менш чым шырыня літары " "адступа, інакш выкарыстоўваць абодва" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Жорсткая шырыня адступа:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Ці вызначаць тып водступаў па змесціве адчыняемага файла." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Шырыня адступа" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Націск Tab (Shif-Tab) павялічвае (памяншае) водступ замест устаўкі літары " "адступа." -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Водступы" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Водступы" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Аўта дапаўненне канструкцый" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2013,19 +2027,20 @@ "Набярыце вызначаную кароткую паслядоўнасць літар і змяніце яе на больш " "складаную адным націскам клавішы" -#: ../src/interface.c:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "XML тэг аўта дадатак" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Аўтаматычна закрываць адчыненыя XML тагі (таксама для тагаў HTML)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Аўтаматычны працяг шматрадковых каментарыяў" -#: ../src/interface.c:3591 +#: ../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" @@ -2033,11 +2048,11 @@ "Аўтаматычна працягваць шматрадковыя каментарыі ў такіх мовах, як C, C++ і " "Java, калі ў тэкст такога каментара дадаецца новы радок." -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "Аўтаматычны дадатак сімвалаў" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2045,89 +2060,101 @@ "Аўтаматычнае завяршэнне вядомых імёнаў аб'ектаў у адчыненых файлах (імёны " "функцый, глабальныя зменныя і г.д.)" -#: ../src/interface.c:3604 +#: ../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 "Макс. колькасць прапаноў для імя слова:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Вышыня спіса дадаткаў:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Колькасць знакаў, неабходных для аўта-дадатку:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 +#, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "Колькасць знакаў, неабходных для з'яўлення спісу аўта-дадатку" -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +#, fuzzy +msgid "Display height in rows for the autocompletion list" msgstr "Колькасць радкоў для паказу ў спісе аўта дадатку" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +#, fuzzy +msgid "Maximum number of entries to display in the autocompletion list" msgstr "Максімальная колькасць радкоў для паказу ў спісе аўта дадатку" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Дадаткі" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Дужкі ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Аўтаматычна ставіць ) пры друку (" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Адзінарныя двукоссі ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "Аўтаматычна ставіць зачыняючы ' пры друку '" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Фігурныя дужкі { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Аўтаматычна ставіць } пры друку {" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Квадратныя дужкі [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "Аўтаматычна ставіць ] пры друку [" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Падвойныя двукоссі \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "Аўтаматычна ставіць зачыняючы \" пры друку \"" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Аўта зачыненне дужак і двукоссяў" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Дадаткі" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Інвертаваць колер падсветкі сінтаксіса" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2135,45 +2162,45 @@ "Выкарыстоўваць белы тэкст на чорным фоне і інвертаваць усе колеры, " "патрабуецца перазапуск Geany" -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Паказваць індыкатары водступу" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Паказваць маленькія рысы з кропкамі для дапамогі ў выбару правільнага " "водступу" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Паказваць прабелы" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Пазначыць прабелы кропкамі, адступы стрэлкамі." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Паказваць завяршэнне радка" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Паказваць літары завяршэння радкоў" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Паказваць нумары радкоў" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Паказаць/Схаваць нумары радкоў." -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Паказваць вылучэнне радкоў" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2181,36 +2208,36 @@ "Паказаць/Схаваць маленькі адступ, які выкарыстоўваецца для вылучэння радкоў, " "справа ад нумару радка" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "пыніць прагортку на апошнім радку" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "Спыняць прагортку на апошнім радку дакумента" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Паказваць" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Маркёр доўгага радка:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Колер маркёра доўгага радка:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Усталяваць колер маркёра доўгага радка" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Выбар колеру" -#: ../src/interface.c:3826 +#: ../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 " @@ -2220,11 +2247,11 @@ "вылучыць доўгія радкі. Усталюйце значэнне больш за 0 для вызначэння на якім " "радку яна павінна з'явіцца." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Рыса" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2232,11 +2259,11 @@ "Паказваць вертыкальную рысу ў акне рэдактара на указанай пазіцыі (глядзі " "ніжэй)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Фон" -#: ../src/interface.c:3846 +#: ../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 " @@ -2246,55 +2273,55 @@ "які ўсталяваны ніжэй (рэкамендавана, калі вы выкарыстаеце прапарцыйныя " "шрыфты)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Забаронены" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Маркёр доўгага радка" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Паказваць" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Адчыняць новыя дакументы з каманднага радка" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Ствараць новы файл для кожнага неіснуючага файла ў камандным радку" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Прадвызначаная літара завяршэння радкоў:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Новыя файлы" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 msgid "Sets the default encoding for newly created files" msgstr "Вызначыць прадвызначаны знаканабор для новых файлаў" -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Прадвызначаны знаканабор (новых файлаў):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Прадвызначаны знаканабор (існуючых файлаў):" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 msgid "Sets the default encoding for opening existing files" msgstr "Вызначыць прадвызначаны знаканабор для адчынення файлаў" -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Выкарыстоўваць адзін і той жа знаканабор для адчынення файлаў" -#: ../src/interface.c:3978 +#: ../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 " @@ -2303,51 +2330,51 @@ "Гэта наладка адключае аўтавызначэнне знаканабору пры адкрыцці файлаў, файл " "адчыняецца ў абраным знаканабору (звычайна ў гэтым няма неабходнасці)." -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Знаканаборы" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Забяспечыць пусты радок у канцы файла" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 msgid "Ensures that at the end of the file is a new line" msgstr "Забяспечыць пусты радок у канцы файла" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Выдаляць завяршаючыя прабелы і адступы" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Выдаляць завяршаючыя прабелы на канцах радкоў" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Змяніць адступы на прабелы" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Змяніць усе адступы ў дакуменце на прабелы" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Захаваць файлы" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Даўжыня спіса апошніх файлаў:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Вызначае колькі файлаў трэба паказваць у спісе нядаўніх файлаў" -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Таймаўт праверкі дыска:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2355,27 +2382,27 @@ "Перыядычнасць праверкі на змену файлаў на дыске (у секундах). Нулявое " "значэнне адключае праверку." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1019 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Файлы" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Зрабіць:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Тэрмінал:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Браўзер:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Пуць і наладкі для прылады make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2383,23 +2410,23 @@ "Тэрмінал эмулятар як xterm, gnome-terminal o konsole (павінен прымаць -е " "аргумент)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Пуць і (магчыма) дадатковыя аргументы да браўзера" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Шлях да прыладаў" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Кантэкстныя дзеянні:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2410,67 +2437,67 @@ "падстаўляць з дапамогай %s. Яго можна ўстаўляць у любым месцы каманды і " "падстаноўка будзе выкананая да яе выканання." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Каманды" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Прылады" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "e-mail адрас распрацоўшчыка" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Ініцыялы распрацоўшчыка" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Пачатковая версія:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Нумар версіі, які файл мае у пачатку." -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Імя кампаніі" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Распрацоўшчык:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Кампанія:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Паштовы адрас:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Ініцыялы:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "імя распрацоўшчыка" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Год:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Дата:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Дата & Час:" -#: ../src/interface.c:4382 +#: ../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." @@ -2478,7 +2505,7 @@ "Вызначце фармат для групавога знака {datetime}. Можна выкарыстоўваць любыя " "параметры, якія падыходзяць для функцыі strftime ANSI C." -#: ../src/interface.c:4389 +#: ../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." @@ -2486,7 +2513,7 @@ "Вызначце фармат для групавога знака {year}. Можна выкарыстоўваць любыя " "параметры, якія падыходзяць для функцыі strftime ANSI C." -#: ../src/interface.c:4396 +#: ../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." @@ -2494,63 +2521,63 @@ "Вызначце фармат для групавога знака {date}. Можна выкарыстоўваць любыя " "параметры, якія падыходзяць для функцыі strftime ANSI C." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Дадзеныя шаблонаў" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Шаблоны" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "Змяніць" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Наладка клавіш" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Прывязкі клавіш" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Каманда:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Шлях да каманды для друку (выкарыстоўвайце %f у якасці імя файла)" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Выкарыстоўваць знешнюю праграму для друку" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Друкаваць нумары радкоў" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Дадаць нумары радкоў на старонку друку" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Друкаваць нумары старонак" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "" "Дадаць нумар старонцы ўнізе кожнай старонцы. Гэта зойме два радка на " "старонцы." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Друкаваць загалоўкі старонкі" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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." @@ -2558,19 +2585,19 @@ "Дадаць невялікі загаловак да кожнай старонцы, які змяшчае нумар старонкі, " "імя файла і дату (глядзі ніжэй). Гэта зойме тры радка на старонцы." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Выкарыстоўваць базавае імя друкуемага файла" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" msgstr "Друкаваць толькі базавае імя (без поўнага шляху) файла" -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Фармат даты:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2579,535 +2606,554 @@ "Вызначце фармат для групавога знака {datetime}. Можна выкарыстоўваць любыя " "параметры, якія падыходзяць для функцыі strftime ANSI C." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Выкарыстоўваць механізм друку GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Друкаваць" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Уласцівасці праекта" -#: ../src/keybindings.c:196 ../src/plugins.c:1106 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Файл" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Новы" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Адчыніць" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Адчыніць вылучаны файл" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Захаваць" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Захаваць як" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Захаваць усе" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Друкаваць" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Зачыніць" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Зачыніць усе" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Загрузіць зноў" -#: ../src/keybindings.c:222 ../src/project.c:495 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Праект" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Уласцівасці праекта" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Вярнуць" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Паўтарыць" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Дубліраваць радок ці вылучэнне" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Выдаліць цяперашні радок(і)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "Выдаліць цяперашні радок(і)" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "Пераставіць цяперашні радок" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Прагарнуць да цяперашняга радка" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Прагарнуць уверх на адзін радок" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Прагарнуць уніз на адзін радок" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Дапоўніць спалучэнне" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Перамяшчаць курсор у фрагменце" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Падавіць дапаўненне спалучэнняў" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Кантэкстныя дзеянні" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Скончыць слова" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Паказваць падказкі" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Паказваць спіс макрасаў" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Буфер абмену" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Выразаць" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Капіяваць" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Уставіць" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Капіяваць цяперашні радок(і)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Выразаць цяперашні радок(і)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Вылучыць" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Вылучыць усё" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Вылучыць цяперашняе слова" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Вылучыць цяперашні радок(і)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Вылучыць цяперашні параграф" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Фармат" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Перамкнуць рэгістр літар" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Каментаваць/Рас каментаваць радок" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Каментаваць радок(і)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Раскаментаваць радок(і)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Павялічыць адступ" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Зменшыць адступ" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Павялічыць адступ на адзін прабел" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Зменшыць адступ на адзін прабел" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Разумныя адступы" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Паслаць сваю каманду 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Паслаць сваю каманду 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Паслаць сваю каманду 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Адправіць вылучэнне ў тэрмінал" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Уставіць" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Уставіць дату" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Уставіць іншы падзяліцель (прабел, адступ...)" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Наладкі" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Шукаць" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Знайсці" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Шукаць наступны" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Шукаць былы" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Шукаць вылучэнне ў наступным" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Шукаць вылучэнне ў былым" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Замяніць" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Шукаць у файлах" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Наступнае паведамленне" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Былое паведамленне" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Знайсці выкарыстоўванне" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Знайсці выкарыстоўванне дакумента" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Будаваць усе" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Перайсці да" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Перамясціцца назад" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Перамясціцца ўперад" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Перайсці да парнай дужкі" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Перамкнуць маркёр" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Перайсці да наступнага маркёра" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Перайсці да былога маркёра" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Перайсці да рэалізацыі" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Перайсці да аб'явы" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Перайсці да пачатка радка" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Перайсці да канца радка" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Перайсці да канца радка" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Перайсці да былога кавалка слова" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Перайсці да наступнага кавалка слова" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Выгляд" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Перамкнуць усе дадатковыя віджэты" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Увесь экран" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Паказаць/Схаваць акно паведамленняў" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Паказаць/Схаваць бакавую панель" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Павялічыць" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Зменшыць" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Фокус" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Пераключыцца ў рэдактар" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Пераключыцца ў заметкі" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Пераключыцца ў тэрмінал" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Пераключыцца ў панель пошуку" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Пераключыцца ў бакавую панель" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Пераключыцца да кампілятара" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Укладкі" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Пераключыцца на левы дакумент" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Пераключыцца на правы дакумент" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Пераключыцца на апошні выкарыстаны дакумент" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Перамясціць дакумент улева" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Перамясціць дакумент управа" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Перамясціць дакумент у пачатак" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Перамясціць дакумент у канец" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Дакумент" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Перамкнуць перанос радкоў" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Перамкнуць абрыў радкоў" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Змяняць прабелы адступамі" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Перамкнуць цяперашнюю схованку" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Згарнуць усе" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Разгарнуць усе" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Загрузіць спіс сімвалаў зноў" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Пабудаваць" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Кампіляваць" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Збудаваць усё" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Будаваць з make (свая цэль)" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Будаваць аб'ект" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Наступная памылка" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Былыя памылка" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Запусціць" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Запусціць (іншы загад)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Наладкі будоўлі" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Паказаць вылучыць колер" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Дапамога" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Камбінацыі клавіш" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Наступныя камбінацыі клавіш можна наладзіць:" -#: ../src/keybindings.c:1531 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Пераключыцца да дакумента" -#: ../src/keyfile.c:809 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Пішы тут што жадаеш, выкарыстоўвай для заметак." -#: ../src/keyfile.c:1009 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Немагчыма загрузіць адзін або больш файлаў з прошлай сесіі" -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Паведамленні адладкі" @@ -3164,7 +3210,7 @@ msgstr "Друкаваць інсталяцыйны префікс Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "не загружаць файлы з прошлай сесіі" #: ../src/main.c:143 @@ -3179,25 +3225,25 @@ msgid "Show version and exit" msgstr "Паказаць версію і выйсці" -#: ../src/main.c:510 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[ФАЙЛЫ...]" -#: ../src/main.c:527 +#: ../src/main.c:487 #, 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:632 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Перамясціць зараз?" -#: ../src/main.c:634 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Перад запускам Geany неабходна перамясціць ваш стары каталог з наладкамі." -#: ../src/main.c:640 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3206,7 +3252,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:650 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3215,7 +3261,7 @@ "Ваш каталог з наладкамі \"%s\" не можа быць перамешчаны ў \"%s\" (%s). Калі " "ласка, перамесціце каталог з наладкамі рукамі." -#: ../src/main.c:731 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3226,22 +3272,22 @@ "Магчымы праблемы пры карыстанні Geany без дырэкторыю наладкі.\n" "Запусціць Geany усё роўна?" -#: ../src/main.c:817 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "Нельга знайсці файл: '%s'." -#: ../src/main.c:1038 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Гэта Geany %s." -#: ../src/main.c:1040 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Немагчыма зрабіць дырэкторыю наладкаў (%s)." -#: ../src/main.c:1279 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Файлы наладкі загружаны зноў." @@ -3257,7 +3303,7 @@ msgid "_Hide Message Window" msgstr "Схаваць акно паведамленняў" -#: ../src/plugins.c:436 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3266,11 +3312,11 @@ "Плагін \"%s\" бінарна не адпавядае гэтай версіі Geany - калі ласка " "перакампілюйце яго." -#: ../src/plugins.c:876 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Кіраванне ўбудовамі" -#: ../src/plugins.c:1024 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3281,23 +3327,23 @@ "Апісанне: %s\n" "Аўтар(ы): %s" -#: ../src/plugins.c:1094 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Актыўны" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Плагін" -#: ../src/plugins.c:1124 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Няма даступных ўбудоў." -#: ../src/plugins.c:1237 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Убудовы" -#: ../src/plugins.c:1257 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3305,51 +3351,59 @@ "нізе знаходзіцца спіс даступных убудоў. Абярыце тыя з іх, якія вы жадаеце " "загружаць пры запуску Geany." -#: ../src/plugins.c:1270 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Падрабязнасці убудовы:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Дзеянне" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Ярлык" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Захапіць клавішу" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Націсніце камбінацыю клавіш, якую вы жадаеце выкарыстоўваць для \"%s\"." -#: ../src/prefs.c:1333 +#: ../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 "Дзеянне" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Ярлык" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "Замяніць" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Замяніць гэту камбінацыю клавіш" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Камбінацыя '%s' ужо выкарыстана для \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Ніжэй увядзіце пуць да прылады. Прылады якія вам не патрэбны можаце пакінуць " "пустымі." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3357,7 +3411,7 @@ "Укажы інфармацыю якую жадаеш выкарыстоўваць у шаблонах.\n" "Глядзі дакументацыю калі не ведаеш як працуюць шаблоны." -#: ../src/prefs.c:1458 +#: ../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." @@ -3368,7 +3422,7 @@ "i>" #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3378,7 +3432,7 @@ "Змяніць. Вы можаце таксама змяніць пісьмовае адлюстраванае." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3387,17 +3441,8 @@ "калі Geany была сабраная і запушчаная з выкарыстаннем GTK версіі 2.10 " "і старэй." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"Увага: Для змянення зместу панелі прыладаў, рэдагуйце файл 'ui_toolbar." -"xml'. Калі ласка, глядзіце дакументацыю для дэталяў." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3405,44 +3450,52 @@ "Папярэджанне: гэтыя наладкі будуць зменены цяперашнім праектам. Глядзі " "Праект->Уласцівасці." -#: ../src/printing.c:270 +#: ../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 "Старонка %d із %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Наладкі дакумента" -#: ../src/printing.c:375 +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" msgstr "Друкаваць толькі базавае імя (без поўнага шляху) друкуючага файла." -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Старонка %d з %d " -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Друкаванне файла \"%s\" было скасавана." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Файл %s надрукаваны." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Друкаванне %s скончылася непаспяхова (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." msgstr "Калі ласка спачатку вызначце каманду для друку ў дыялогу ўласцівасцяў." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3453,7 +3506,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Друкаванне \"%s\" скончылася непаспяхова (код зваротку: %s)." @@ -3606,11 +3659,11 @@ msgid "Project \"%s\" opened." msgstr "Праект \"%s\" адчынены." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Сталы выраз" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3618,15 +3671,15 @@ "Выкарыстоўваць POSIX сталыя выразы. Для дэталёвай інфармацыі па сталым " "выразам глядзі дакументацыю." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Шукаць у адваротным кірунку" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Выкарыстоўваць паслядоўнасці змены" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3634,126 +3687,126 @@ "Замяняць \\\\, \\t, \\n, \\r і \\uXXXX (Літары юнікоду) на адпаведныя " "кіруючыя літары" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "З улікам рэгістру" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Падыходзіць толькі поўнае слова" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Падыходзіць з пачатку слова" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "Былы" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "Наступны" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../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:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "Знайсці ўсё" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "Абазначыць" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Памеціць усё супадзенні у цяперашнім дакуменце" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "У сесіі" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "У дакуменце" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Зачыніць дыялог" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Забараніце гэту наладку каб трымаць дыялог адчыненым." -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Замяніць і шукаць" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Замяніць на:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Замяніць усё" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "У вылучэнні" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Замяніць ўсе знойдзеныя выпадкі ў вылучаным тэксце" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "Дырэкторыя:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "Знаканабор:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Сталыя радкі" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Шукаць сталы выраз" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "Глядзі старонку дакументацыі grep для дакладнай інфармацыі" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "Расшыраны сталы выраз" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Рэкурсіўна ў паддырэкторыях" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "Шукаць не падыходзячыя" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Інвертаваць вынікі пошуку, вылучыць не супадаючыя радкі" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Дадатковыя наладкі:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Наладкі для Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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\"." @@ -3761,7 +3814,7 @@ msgstr[1] "Знойдзена %d супадзення для \"%s\"." msgstr[2] "Знойдзена %d супадзенняў для \"%s\"." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, c-format msgid "Replaced text in %u file." msgid_plural "Replaced text in %u files." @@ -3769,40 +3822,40 @@ msgstr[1] "Зменены тэкст у %u файлах" msgstr[2] "Зменены тэкст у %u файлах" -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Дрэнная дырэкторыя для пошуку файлаў" -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Тэкст не знойдзены" -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "Нельга знайсці прыладу grep '%s'; (правер шлях ў Уласцівасцях)" -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Пошук..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (у дырэкторыі: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Немагчыма адчыніць дырэкторыю (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" "Пошук скончыўся непаспяхова (глядзі Дапамога->Паведамленні адладкі для " "дэталяў)." -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -3810,223 +3863,233 @@ msgstr[1] "Пошук завершаны з %d супадзеннямі." msgstr[2] "Пошук завершаны з %d супадзеннямі." -#: ../src/search.c:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Супадзенні ня знойдзены" -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Глава" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Секцыя" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Секцыя 1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Секцыя 2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Секцыя 3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Апендыкс" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Модуль" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../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:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Канструктар тыпаў" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Секцыі" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Каманда" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Асяродзе" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Падсекцыя" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Пад-падсекцыя" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Метка" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Структуры" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Пакет" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Мой" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Месны" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Наш" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Канстанты" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Якары" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Загаловак (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Загаловак (H2)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Загаловак (H3)" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "Вылучэнне ID" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Вылучэнне тыпу" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Модулі" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Сінглтоны" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Прасторы імёнаў" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Уласцівасці" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Экспарт" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Чальцы" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Меткі" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Падпраграмы" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Блокі" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Макрасы" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Аб'яўленні" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Мэты" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Прасторы імёнаў" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Структуры" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1311 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Невядомы тып файла для пашырэння \"%s\".\n" -#: ../src/symbols.c:1332 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Немагчыма стварыць файл тэгаў, магчыма таму, што ніякіх тэгаў не знойдзена.\n" -#: ../src/symbols.c:1339 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4035,7 +4098,7 @@ "Карыстаць: %s -g <файл тэгаў> <спіс файлаў>\n" "\n" -#: ../src/symbols.c:1340 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4046,167 +4109,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:1354 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Загрузіць тэгі" -#: ../src/symbols.c:1361 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Geany тэг файлы (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1381 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Загружана %s тэгаў файл: '%s'." -#: ../src/symbols.c:1383 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Немагчыма загрузіць файл тэгаў '%s'." -#: ../src/symbols.c:1517 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Аб'яўленне \"%s\" не знойдзена" -#: ../src/symbols.c:1519 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Рэалізацыя \"%s\" не знойдзена." -#: ../src/symbols.c:1810 -msgid "_Expand All" -msgstr "Разгарнуць усё" - -#: ../src/symbols.c:1815 -msgid "_Collapse All" -msgstr "Згарнуць усё" - -#: ../src/symbols.c:1825 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Сартаваць па імені" -#: ../src/symbols.c:1832 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Сартаваць па паяўленню" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Захаваць цяперашні файл" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Захаваць усё" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Захаваць усе адчыненыя файлы" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Загрузіць цяперашні файл з дыска" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Зачыніць цяперашні файл" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Зачыніць усе адчыненыя файлы" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Выразаць цяперашняе вылучэнне" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Капіяваць цяперашняе вылучэнне" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Уставіць змест буфера абмену" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Выдаліць цяперашняе вылучэнне" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Адмяніць апошнюю мадыфікацыю" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Адмяніць адмену апошняй мадыфікацыі" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Кампіляваць цяперашні файл" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Выканаць альбо глядзець цяперашні файл" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Адчыніць дыялог вылучэння колеру, для выбару колеру з палітры" -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Павялічыць тэкст" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Зменшыць тэкст" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Зменшыць адступ" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Павялічыць адступ" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Знайсці уведзены тэкст у цяперашнім файле" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Перайсці да ўведзенага радка" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Паказваць дыялог уласцівасцяў" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Выхад" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Друкаваць дакумент" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "Для ўступа ў сілу зробленых змен неабходна перазапусціць Geany" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Памеціць усё супадзенні у цяперашнім дакуменце" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Стварыць новы файл" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Адчыніць існуючы файл" -#: ../src/toolbar.c:208 +#: ../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 "Паказваць" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4274,123 +4348,144 @@ msgid "Characters:" msgstr "Літары:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Тагі не знойдзены" -#: ../src/treeviews.c:491 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Паказваць спіс сімвалаў" -#: ../src/treeviews.c:499 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Паказваць спіс дакументаў" -#: ../src/treeviews.c:507 ../plugins/filebrowser.c:586 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Схаваць бакавую панель" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Паказваць радок стану" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "радок: %d слупок: %d выл: %d\t" #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "ТЧ" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "Адступ" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "ПРБ" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "АДСТ/ПРБ" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "Рэжым: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "знаканабор: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "тып файла: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "Рэжым" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "вобласць бачнасці: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Шрыфт адноўлены (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Стандартная бібліятэка C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Стандартная бібліятэка)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ Стандартная бібліятэка" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "Усталяваць свой фармат даты" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Вылучыць дырэкторыю" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Вылучыць файл" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Файлы наладак" -#: ../src/ui_utils.c:1756 +#: ../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 "Max (CR)" + +#: ../src/utils.c:326 +msgid "Unix (LF)" +msgstr "Unix (LF)" + #: ../src/vte.c:301 ../src/vte.c:726 msgid "Terminal" msgstr "Тэрмінал" @@ -4515,7 +4610,7 @@ "Гэтая наладка адключае цэтлік для выкліку меню (звычайна F10). Гэта можа " "спатрэбіцца, напрыклад, калі вы выкарыстоўваеце MC у акне тэрмінала." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1125 +#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 msgid "Follow the path of the current file" msgstr "Следаваць за цяперашнім файлам" @@ -4549,161 +4644,145 @@ "Запускаць праграмы ў VTE, замест таго, каб адчыняць асобнае акно з " "тэрміналам. Увага: праграмы, выкананыя ў VTE, нельга спыніць" -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Файлы Geany праектаў" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Файлы, якія можна выканаць" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Памылка" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Пытанне" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Папярэджанне" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Інфармацыя" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Будаўнічы класаў" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Стварае файлы зыходнага кода для новых тыпаў класаў." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Стварыць клас" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Клас" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Імя класа:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Загаловак файла:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Зыходны файл:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Спадчыннасць" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Базавы клас:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Базавы загаловак:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Агульныя" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Базавы GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Наладкі" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Стварыць канструктар" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Стварыць дэструктар" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Канструктар GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Стварыць клас" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "C++ клас" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "GTK+ клас" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML літары" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Устаўляць HTML спалучэнні такія як '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Каманда распрацоўшчыкаў Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML літары" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "SO 8859-1 літары" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Грэцкія літары" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Матэматычныя літары" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Тэхнічныя літары" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Указальныя літары" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Знакі прыпынку" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Іншыя літары" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Адмысловыя літары" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "Уставіць" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4711,163 +4790,163 @@ "Выберы адмысловыя літары са спіса ўнізе, і зрабі падвоены ціск на ім, альбо " "выкарыстай кнопку для устаўкі літары ў пазіцыі курсора." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Літара" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (імя)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Уставіць адмысловыя HTML літары" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "HTML змяненні" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "Перамкнуць HTML" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Змена адмысловых літараў" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Уставіць адмысловыя HTML літары" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Замяняць адмысловыя літары" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Паказаць/Схаваць стан убудовы" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Экспарт" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Экспартаваць цяперашні файл у розныя фарматы." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Экспартаваць файл" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "Выкарыстоўваць цяперашні узровень маштабу!" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "Адлюстроўваць тэкст дакумента бягучым памерам шрыфта." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Дакумент паспяхова экспартаваны як '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Файл '%s' не можа быць запісаны (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' ужо існуе. Замяніць яго?" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "Экспарт" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Як HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Як LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Файлавы аглядальнік" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Дадаць укладку аглядальніка файлаў да бакавой панелі." -#: ../plugins/filebrowser.c:329 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Абрана занадта шмат аб'ектаў!" -#: ../plugins/filebrowser.c:405 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Немагчыма выканаць знешнюю каманду '%s' (%s)." -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Адчыніць у знешняй праграме" -#: ../plugins/filebrowser.c:567 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "Знайсці ў файлах" -#: ../plugins/filebrowser.c:577 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Паказваць схаваныя файлы" -#: ../plugins/filebrowser.c:769 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Уверх" -#: ../plugins/filebrowser.c:774 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Абнавіць" -#: ../plugins/filebrowser.c:779 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:784 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Усталяваць пуць з дакумента" -#: ../plugins/filebrowser.c:792 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Чысціць фільтр" -#: ../plugins/filebrowser.c:806 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Фільтр:" -#: ../plugins/filebrowser.c:1025 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Фокус спіс файлаў" -#: ../plugins/filebrowser.c:1027 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Фокус на ўвод шляху" -#: ../plugins/filebrowser.c:1070 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "Немагчыма зрабіць наладкавую дырэкторыю ўбудоў." -#: ../plugins/filebrowser.c:1095 +#: ../plugins/filebrowser.c:1092 msgid "External open command:" msgstr "Знешняя каманда адкрыцця:" -#: ../plugins/filebrowser.c:1104 +#: ../plugins/filebrowser.c:1101 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4881,15 +4960,15 @@ "%f будзе зменена на імя файла з поўным шляхам да яго\n" "%d будзе зменена на дырэкторыю ў якой знаходзіцца файл" -#: ../plugins/filebrowser.c:1110 +#: ../plugins/filebrowser.c:1107 msgid "Show hidden files" msgstr "Паказваць схаваныя файлы" -#: ../plugins/filebrowser.c:1116 +#: ../plugins/filebrowser.c:1113 msgid "Hide object files" msgstr "Хаваць файлы аб'ектаў" -#: ../plugins/filebrowser.c:1120 +#: ../plugins/filebrowser.c:1117 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4897,40 +4976,41 @@ "Не паказваць утвораныя аб'ектныя файлы, такія як *.o, *.obj. *.so, *.dll, *." "a, *.lib" -#: ../plugins/filebrowser.c:1131 -msgid "Set the project's base directory" +#: ../plugins/filebrowser.c:1128 +#, fuzzy +msgid "Use the project's base directory" msgstr "Усталяваць базавую дырэкторыю праекта" -#: ../plugins/filebrowser.c:1135 +#: ../plugins/filebrowser.c:1132 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Зменіць шлях на базавую дырэкторыю адчыненага праекта" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Захаваць дзеянні" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "Гэта убудова забяспечвае розныя дзеянні звязаныя з захаваннем файлаў." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Падменнае капіяванне: Немагчыма стварыць дырэкторыю (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Падменнае капіяванне: Немагчыма прачытаць файл (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Падменнае капіяванне: Немагчыма запісаць файл (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4939,99 +5019,128 @@ msgstr[2] "Аўта захаванне: Аўтаматычна захавана %d файлаў." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Выберыце дырэкторыю" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Каталог для падменных копій не існуе або няма мае правоў на запіс." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Аўта захаванне" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "Дазволіць" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "Інтэрвал аўта захавання" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "секунды" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "Пісаць у акно статуса калі файлы былі аўтаматычна захаваны" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Захаваць толькі цяперашні адчынены файл" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Захаваць усе адчыненыя файлы" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Неадкладнае захаванне" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "Тып файла для новых адчыненых файлаў:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Падменная копія" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "Дырэкторыя для захавання падменных файлаў:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "Фармат даты/часу для падменных файлаў (\"man strftime\" для дэталяў):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Узровень дырэкторыя для захавання падменных файлаў:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Падзяліць вакно" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Падзяліць вакно рэдактара на два акна" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Памеціць усё супадзенні у цяперашнім дакуменце" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "Аб'яднаць" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "Падзяліць вакно" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "Гарызантальна" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "Вертыкальна" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Падзяліць гарызантальна" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Падзяліць вертыкальна" -#: ../plugins/splitwindow.c:426 +#: ../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 /tmp/H5qKeNSrz8/geany-0.17/po/bg.po /tmp/ssBwSf4GIv/geany-0.18/po/bg.po --- geany-0.17/po/bg.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/bg.po 2009-08-16 17:18:28.000000000 +0100 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.16\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2008-11-30 16:22+0200\n" "Last-Translator: Atanas Beloborodov \n" "Language-Team: Bulgarian \n" @@ -31,70 +31,70 @@ msgid "Integrated Development Environment" msgstr "Вградена среда за разработка" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "За Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Бърза и лека среда за разработване" -#: ../src/about.c:208 +#: ../src/about.c:210 #, fuzzy, c-format msgid "(built on or after %s)" msgstr "(компилиран на %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Информация" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Разработчици" -#: ../src/about.c:264 +#: ../src/about.c:266 #, fuzzy msgid "maintainer" msgstr "Отговорник по поддръжката" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "разработчик" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "отговорник по поддържането на превода" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Преводачи" -#: ../src/about.c:309 +#: ../src/about.c:311 #, fuzzy msgid "Previous Translators" msgstr "Преводачи" -#: ../src/about.c:330 +#: ../src/about.c:332 #, fuzzy msgid "Contributors" msgstr "Сътрудници" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "Някой от многото сътрудници (за повече детайли, вижте файла %s)" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Екип" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Лиценз" -#: ../src/about.c:389 +#: ../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." @@ -102,7 +102,7 @@ "Текстът, който съдържа лиценза, не бе намерен, моля посетете http://www.gnu." "org/licenses/gpl-2.0.txt, за да го прегледате в online вариант." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, fuzzy, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -111,138 +111,138 @@ "Не успях да намеря терминала '%s' (проверете пътя в настройките за " "Терминална програма в Предпочитания)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Не успях да заредя \"%s\" (не можах да създам зареждащия script)" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Процеса завърши неуспешно (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (в директорията: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, fuzzy, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Не успях да сменя работната директория на %s" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Имаше грешка при изпълнението на файла във VTE, защото най-вероятно съдържа " "команда." -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Неуспешна компилация." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Компилирането завърши успешно." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Компилирай" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 msgid "_Build" msgstr "_Построй" #. build the code with make all -#: ../src/build.c:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Направи потребителска _Цел" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Направи _Обект (Object)" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Следваща грешка" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 #, fuzzy msgid "_Previous Error" msgstr "_Предишна грешка" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "_Задай Включени файлове и аргументи" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 #, fuzzy msgid "LaTeX -> _DVI" msgstr "LaTeX·->·DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 #, fuzzy msgid "LaTeX -> _PDF" msgstr "LaTeX·->·PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 #, fuzzy msgid "_View DVI File" msgstr "Покажи DVI файл" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 #, fuzzy msgid "V_iew PDF File" msgstr "Покажи PDF файл" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 #, fuzzy msgid "_Set Arguments" msgstr "Задай аргументи" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Задай аргументи" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" "Задава програми и опции за компилиране и разглеждане на (La)TeX файлове." -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Създаване на DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Създаване на PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Преглед на DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Преглед на PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -251,73 +251,73 @@ "%f ще бъде заменено с името на текущия файл, напр. тестов_файл.c\n" "%e ще бъде заменено с името на файла без разширението, напр. тестов_файл" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Задава Включвания и Аргументи" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Задава командите за построяване и изпълнение на програми." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, fuzzy, c-format msgid "%s commands" msgstr " команди" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Компилирай:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Построй:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Изпълни:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 #, fuzzy msgid "Build the current file" msgstr "Компилирай текущия файл" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Направете потребителска цел" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Въведете потребителски опции тук, целият въведен текст се подава на " "командата за построяване." -#: ../src/build.c:1976 +#: ../src/build.c:1967 #, fuzzy msgid "Build the current file with Make and the default target" msgstr "Построява текущия файл със същата make програма и цел по подразбиране" -#: ../src/build.c:1979 +#: ../src/build.c:1970 #, fuzzy msgid "Build the current file with Make and the specified target" msgstr "Построява текущия файл с програмата make и зададената цел" -#: ../src/build.c:1982 +#: ../src/build.c:1973 #, fuzzy msgid "Compile the current file with Make" msgstr "Компилирай текущия файл" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Не успях да изпълня програмата за преглед" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Процеса не можа да бъде спрян: (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Няма повече грешки при построяването." @@ -325,8 +325,8 @@ msgid "Do you really want to quit?" msgstr "Наистина ли искате да спрете програмата?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Презареди" @@ -339,53 +339,53 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Сигурни ли сте, че искате да презаредите '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Отиди на ред" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Въведете линията до която искате да отидете:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "Моля задайте тип на текущия файл преди да използвате тази функция." -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "дд.мм.гггг" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "мм.дд.гггг" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "гггг/мм/дд" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "дд.мм.гггг чч:мм:сс" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "мм.дд.гггг чч:мм:сс" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "гггг/мм/дд чч:мм:сс" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 #, fuzzy msgid "_Use Custom Date Format" msgstr "Използвай потребителски формат за датата" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Потребителски формат за дата" -#: ../src/callbacks.c:1495 +#: ../src/callbacks.c:1498 #, fuzzy msgid "" "Enter here a custom date and time format. You can use any conversion " @@ -395,26 +395,26 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Формата за дата не може да бъде преобразуван (най-вероятно е прекалено " "дълъг)." -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Няма повече съобщения." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Отвори файл" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "И_зглед" -#: ../src/dialogs.c:150 +#: ../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." @@ -422,29 +422,29 @@ "Отваря файла в режим \"само за четене\". Ако изберете за отваряне повече от " "един файл, всичките файлове ще бъдат отворени само за четене." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Засечи по разширението на файла" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Засечи от файла" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "Функции" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Покажи _скритите файлове" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Задайте знаково кодиране:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -456,11 +456,11 @@ "полезно когато знаете, че кодировката на файла не може да бъде засечена." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Задай тип на файла:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -471,25 +471,34 @@ "Обърнете винимание, че ако изберете няколко файла, те ще бъдат отворени с " "избрания тип." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "_Предефиниране" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Запази файла" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 #, fuzzy msgid "R_ename" msgstr "Име на файла:" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 #, fuzzy msgid "Save the file and rename it" msgstr "Съхрани файла и го преименувай" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Oтвори файла в нов подпрозорец" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -498,130 +507,147 @@ "Запази сегашния незапазен файл отворен и отвори новозаписания в нов под-" "прозорец." -#: ../src/dialogs.c:622 +#: ../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 "_Не запазвай" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Файлът %s не бе запазен." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Искате ли да го запазите преди затварянето?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Избери шрифт" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "" "Имаше грешка и не можах да получа информацията от файла (напр. от нов файл)" -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "неизвестен" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Свойства" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Вид:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Размер:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Местоположение:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Само за четене:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(само в Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Кодировка:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(с BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(без BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Променен:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Променен:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Последно променян:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Разрешения:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Четене:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Писане:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Собственик:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Група:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Други:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Затворих файла %s." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Отворих новия файл %s." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Не можах да отворя файла %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -636,12 +662,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файлът %s не е валиден/а/о %s" -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -649,51 +675,54 @@ msgstr "" "Файлът %s не изглежда като текстови файл или кодировката не се поддържа." -#: ../src/document.c:1168 +#: ../src/document.c:1122 #, fuzzy msgid "Spaces" msgstr "Namespaces" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Под-прозорци" -#: ../src/document.c:1174 +#: ../src/document.c:1128 #, 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:1179 +#: ../src/document.c:1133 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Режим на автоматичния отстъп:" -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Неправилно име на файл" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Файлът %s е презареден." -#: ../src/document.c:1354 +#. 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 "Отворих файла %s(%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", само за четене" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "Грешка при записването на файла." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, fuzzy, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -703,7 +732,7 @@ "бъде запазен.\n" "Съобщение на грешката: %s\n" -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -712,52 +741,52 @@ "Съобщение за грешка: %s\n" "Има грешка в \"%s\" (ред: %d, колона: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, fuzzy, c-format msgid "Error message: %s." msgstr "Грешка при записването на файла (%s)" -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Грешка при записването на файла." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Грешка при записването на файла (%s)" -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Запазих файла %s." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "Не успях да намеря %s." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Да пробвам ли отново с търсенето?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 +#: ../src/search.c:1689 #, fuzzy, c-format msgid "No matches found for \"%s\"." msgstr "Няма намерени съвпадения за '%s'." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../src/document.c:2022 ../src/document.c:2031 #, 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:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Искате ли да го презаредите?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -766,33 +795,21 @@ "Файлът '%s' на диска е по-скорошен от\n" "този в паметта." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Опит да запая файла отново?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, fuzzy, c-format msgid "File \"%s\" was not found on disk!" msgstr "Не успях да намеря %s." -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win·(CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac·(CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix·(LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 #, fuzzy msgid "Enter Tab Width" msgstr "Широчина на табулацията" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Въведете брой на интервалите, които да бъдат заменени от бутон tab." @@ -894,137 +911,126 @@ msgstr "Традниционен китайски" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Японски" -#: ../src/encodings.c:141 ../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 "Корейски" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Без кодиране" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Западно-европейски" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Източно-европейски" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Източно_азиатски" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_ЮИ и ЮЗ азиатски" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Средно-европейски" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Без" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 +#: ../src/filetypes.c:237 ../src/filetypes.c:259 #, fuzzy, c-format msgid "%s source file" msgstr "Изходен файл на С" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "Изходен файл на С" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Без" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Shell скрипт" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 #, fuzzy msgid "XML document" msgstr "XML документ" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 #, fuzzy msgid "Cascading StyleSheet" msgstr "CSS" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL Dump файл" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff файл" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Файл с настройки (Config)" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 #, fuzzy msgid "Gettext translation file" msgstr "отговорник по поддържането на превода" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, fuzzy, c-format msgid "%s script file" msgstr "%s скриптов файл" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "преСтруктуриранТекстови файл" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Езици за _програмиране" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "_Скриптови езици" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "_Markup езици" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 #, fuzzy msgid "M_iscellaneous Languages" msgstr "Други езици" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Всички изходни файлове" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Всички файлове" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "неозагалвен" @@ -1038,8 +1044,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "невидим" @@ -1047,7 +1053,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Отвори избрания фа_йл" @@ -1068,12 +1074,12 @@ msgid "Page Set_up" msgstr "Настройки на страни_цата" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 #, fuzzy msgid "Close Ot_her Documents" msgstr "Затвори текущия файл" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "_Затвори Всички" @@ -1081,91 +1087,87 @@ msgid "_Edit" msgstr "_Редактиране" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Избор на вси_чко" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Формат" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 #, fuzzy msgid "T_oggle Case of Selection" msgstr "_Удвои реда или избрания текст" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Коментирай ред(ове)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "_Откоментирай ред(ове)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Об_ърни коментирането на реда" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "_Удвои реда или избрания текст" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "У_величи отстъпа" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "_Намали отстъпа" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "Из_прати избрания текст на" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "Из_прати избрания текст на" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Вмъкн_и коментари" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Вмъкни запис в дневника на промените" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 #, fuzzy msgid "Insert File _Header" msgstr "Вмъкни хедър" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 #, fuzzy msgid "Insert _Function Description" msgstr "Вмъква коментар на функция" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Вмъква многоредов коментар" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 #, fuzzy msgid "Insert _GPL Notice" msgstr "Вмъква GPL бележка" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 #, fuzzy msgid "Insert _BSD License Notice" msgstr "Вмъкнва BSD лиценз" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Вмъкни да_та" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Вмъ_кни \"include·<...>\"" @@ -1190,7 +1192,7 @@ msgid "Find in F_iles" msgstr "Намери въф _файлове" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Замени" @@ -1212,7 +1214,7 @@ msgid "Pr_evious Message" msgstr "Следващо съобщение" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Отско_чи до ред" @@ -1241,7 +1243,7 @@ msgid "Show Side_bar" msgstr "Покажи _страничната лента" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Редактор" @@ -1290,17 +1292,17 @@ msgid "In_dent Type" msgstr "Ви_д на вмъкването" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 #, fuzzy msgid "_Tabs" msgstr "Под-прозорци" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 #, fuzzy msgid "_Spaces" msgstr "Интервали" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 #, fuzzy msgid "T_abs and Spaces" msgstr "_Замени табулациите с интервали" @@ -1426,7 +1428,7 @@ msgid "_Debug Messages" msgstr "Съобщения" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Символи" @@ -1451,84 +1453,89 @@ msgid "Scribble" msgstr "Бележник" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 #, fuzzy msgid "Images _and Text" msgstr "Изображения и текст" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 #, fuzzy msgid "_Images Only" msgstr "Само изображения" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 #, fuzzy msgid "_Text Only" msgstr "Само текст" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 #, fuzzy msgid "_Large Icons" msgstr "Големи икони" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 #, fuzzy msgid "_Small Icons" msgstr "Малки икони" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "Малки икони" -#: ../src/interface.c:1770 +#: ../src/interface.c:1769 #, fuzzy -msgid "_Hide toolbar" +msgid "_Customize Toolbar" msgstr "Скрий лентата с инструментите" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "Скрий лентата с инструментите" + +#: ../src/interface.c:2094 #, fuzzy msgid "Find _Usage" msgstr "Намери къде се използва" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 #, fuzzy msgid "Find _Document Usage" msgstr "Намери къде се използва" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 #, fuzzy msgid "Go to _Tag Definition" msgstr "Отиди до дефиницията на тага" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 #, fuzzy msgid "Go to T_ag Declaration" msgstr "Отиди до декларацията на тага" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 #, fuzzy msgid "Conte_xt Action" msgstr "Контекстно действие" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Предпочитания" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Зареждай файловете от последната сесия" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "При стартиране отваря файловете от последната сесия" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 #, fuzzy msgid "Load virtual terminal support" msgstr "Зареди истински терминален имитатор при стартиране" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1537,44 +1544,44 @@ "Дали да се зарежда истиски терминален имитатор (VTE) при стартиране. " "Изключете го ако не ви трябва." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Разреши поддръжката на плъгини." -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 #, fuzzy msgid "Startup" msgstr "Странична лента" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Запазай мястото и размерите на прозореца" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Запазва позицията и размерите на прозореца и ги възстановява при стартиране" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Потвръждение при излизане." -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Питай за потвръждение на излизане от програмата." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 #, fuzzy msgid "Shutdown" msgstr "Изключване" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 #, fuzzy msgid "Startup path:" msgstr "Основен път:" -#: ../src/interface.c:2758 +#: ../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." @@ -1583,40 +1590,40 @@ "файлове. Трябва да е абсолютна. Ако полето е празно, ще се използва " "работната директория." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Файлове на проекта:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Път с който да започвам когато отварям файловете на проекта." -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 #, fuzzy msgid "Extra plugin path:" msgstr "Разреши поддръжката на плъгини." -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Пътища" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 #, fuzzy msgid "Startup" msgstr "Състояние" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Пиукай когато има грешки или когато свърши компилирането" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1624,11 +1631,11 @@ msgstr "" "Дали да издава звуков сигнал ако има грешка или когато компилацията приключи." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Превключи на списъка със състояния при ново съобщение." -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1637,11 +1644,11 @@ "Превключи на лентата за съобщения за състоянието (на дъното на прозореца-" "белебник) ако се появи ново съобщение" -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Не показвай съобщения в лентата за съобщения" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1649,11 +1656,12 @@ "Премахва всички съобщения от лентата за съобщения. Съобщенията пак се " "показват в прозореца за съобщения." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Автоматичен фокус на прозорците (фокусът следва мишката)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1663,15 +1671,15 @@ "редактора, прозореца за бележки, търсенето в лентата за инструменти и отиди " "до, както и за VTE." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Разни" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Винаги търси наново и крий диалога за търсене" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1680,32 +1688,32 @@ "Винаги търси наново в документа и крий прозореца за търсене след натискане " "на Намери следващото/предишното" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2896 +#: ../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:2898 +#: ../src/interface.c:2918 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Неправилна директория за търсене във файлове." -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 #, fuzzy msgid "Search" msgstr "Странична лента" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 #, fuzzy msgid "Use project-based session files" msgstr "Проектни файлове на Geany" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " @@ -1714,12 +1722,12 @@ "Дали файловете от сесията на проекта да се съхраняват и да се зареждат " "отново, когато пак се отвори." -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 #, fuzzy msgid "Store project file inside the project base directory" msgstr "Да създам ли основната директория на проекта?" -#: ../src/interface.c:2929 +#: ../src/interface.c:2949 #, fuzzy msgid "" "When enabled, a project file is stored by default inside the project base " @@ -1732,80 +1740,80 @@ "една директория над базовата директория. Вие все още може да промени пътя на " "проекта файл в диалоговия прозорец Нов проект." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 #, fuzzy msgid "Projects" msgstr "Проекти" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 #, fuzzy msgid "Miscellaneous" msgstr "Разни" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Общи" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Покажи списъка със символите" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Включи/изключи списъка със символите" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 #, fuzzy msgid "Show documents list" msgstr "Показвай списък с отворените файлове" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 #, fuzzy msgid "Toggle the documents list on and off" msgstr "Включи/изключи списъка с отворените файлове" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Странична лента" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Списък със символите:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Прозорец за съобщения:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Редактор:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Задава шрифта за прозореца за съобщения" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Задава шрифт за списъка със символи" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Задава шрифт на редактора" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Шрифтове" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Показвай подпрозорците на редактора" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 #, fuzzy msgid "Show close buttons" msgstr "Показвай бутона Избери цвят" -#: ../src/interface.c:3064 +#: ../src/interface.c:3084 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1814,113 +1822,118 @@ "Показва малко х-че във файловите под-прозорци за лесното им затваряне " "(изисква рестарт на Geany)" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Положение на подпрозорците с нови файлове:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Ляво" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "Файловите подпрозорци ще бъдат слагани отляво на бележника" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Дясно" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "Файловите подпрозорци ще бъдат слагани отдясно на бележника" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Промяеня всички допълнителни джаджи" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Промяеня всички допълнителни джаджи" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 #, fuzzy msgid "Editor tabs" msgstr "Шрифтове" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Горе" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Долу" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Странична лента:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 #, fuzzy msgid "Tab positions" msgstr "Местоположение:" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 #, fuzzy msgid "Show status bar" msgstr "Покажи лентата на състоянието" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "Дали да показва лентата на състоянието на дъното на главния прозорец" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Интерфейс" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "Показвай лентата с инструментите" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 #, fuzzy msgid "Toolbar" msgstr "Пътища на инструментите" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Стил на иконите:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Големина на иконите:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Външен вид" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Покажи _лентата с инструменти" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Лента с инсрументи" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Пренасяне на редове" -#: ../src/interface.c:3349 +#: ../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 " @@ -1930,11 +1943,11 @@ "пренасянето на редове може доста да спъне производителността за големи " "документи и по тази причина е добре да бъде изключено на по-слаби машини." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Разреши \"умен\" home клавиш" -#: ../src/interface.c:3354 +#: ../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 " @@ -1947,11 +1960,11 @@ "Ако е забранен, home винаги връща в началото на реда - независимо от " "настоящата му позиция." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Изключи Влачене и Спускане." -#: ../src/interface.c:3359 +#: ../src/interface.c:3403 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1961,20 +1974,20 @@ "не е възможнода се влачат и спускат избрани текстове в или извън прозореца " "на редактода." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Разреши сгъването" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Дали да разреши сгъването на кода" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Отсгъни всички дъщерни на точка за сгъване" -#: ../src/interface.c:3369 +#: ../src/interface.c:3413 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1983,11 +1996,11 @@ "Сгъни или разгъни всички деца на точка за сгъване. Ако се натисне shift " "докато се сгъва, ще се наблюдава обратното поведение." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Използвай показатели за грешките при компилирането" -#: ../src/interface.c:3374 +#: ../src/interface.c:3418 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1996,160 +2009,159 @@ "Дали да използва показатели (вълнисто подчертаване) за открояване на " "редовете,където компилаторът е открил предупреждение или грешка." -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 #, fuzzy msgid "Newline strips trailing spaces" msgstr "Махни излишните символи на края" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Разреши новия ред да маха всички излишни символи от предния ред." -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 #, fuzzy msgid "Comment toggle marker:" msgstr "Включи/изключи маркера" -#: ../src/interface.c:3406 +#: ../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 "" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Свойства" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 #, fuzzy msgid "Features" msgstr "Свойства" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 #, fuzzy msgid "Auto-indent mode:" msgstr "Режим на автоматичния отстъп:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Основен" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Текущи символи" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 #, fuzzy msgid "Match braces" msgstr "Отиди до съвпадащата скоба" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Вид:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 #, fuzzy msgid "Width:" msgstr "Писане:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 #, fuzzy msgid "The width in chars of a single indent" msgstr "Широчината, в символи, която ще заема една табулация" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 #, fuzzy msgid "Hard tab width:" msgstr "Широчина на табулацията" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Дали да засече вида на вмъкване от съдържанието на файла при отваряне." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 #, fuzzy msgid "Tab key indents" msgstr "Умно вмъкване на реда" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 #, fuzzy msgid "Indentation" msgstr "Контекстна команда" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 #, fuzzy msgid "Indentation" msgstr "Контекстна команда" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 #, fuzzy msgid "Snippet completion" msgstr "Не завършвай блоковете" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 #, fuzzy msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "Въведете съкращение, което да се разширява с натискане на един бутон." -#: ../src/interface.c:3583 +#: ../src/interface.c:3627 #, fuzzy -msgid "XML tag auto completion" +msgid "XML tag autocompletion" msgstr "Автоматично завършване на XML-тагове" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 #, fuzzy msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Автоматично завършване на отворени XML-тагове (това включва и HTML-тагове)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3591 +#: ../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 "" -#: ../src/interface.c:3593 -#, fuzzy -msgid "Automatic symbol completion" -msgstr "Автоматично завършване на символи" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2157,150 +2169,159 @@ "Автоматично завършване на познати символи от отворените файлове (това са " "имена на функции,глобални променливи и т.н.)" -#: ../src/interface.c:3604 +#: ../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 "" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Съкращения за разширяване:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 #, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" "Броят на съкращенията, които да бъдат показани в списък за подсказване." -#: ../src/interface.c:3640 +#: ../src/interface.c:3692 #, fuzzy -msgid "Display height in rows for the auto completion list" +msgid "Display height in rows for the autocompletion list" msgstr "" "Броя на редовете, които да бъдат показани в списъка за автоматично " "завършване." -#: ../src/interface.c:3649 +#: ../src/interface.c:3701 #, fuzzy -msgid "Maximum number of entries to display in the auto completion list" +msgid "Maximum number of entries to display in the autocompletion list" msgstr "" "Броя на редовете, които да бъдат показани в списъка за автоматично " "завършване." -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 #, fuzzy msgid "Completions" msgstr "Автоматично завършване" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 #, fuzzy msgid "Completions" msgstr "Автоматично завършване" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 #, fuzzy msgid "Invert syntax highlighting colors" msgstr "Обърни наопъки цветовете за открояване на синтаксиса" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Показвай ориентировачни занци за отстъп" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Показва малки точкови линии за да ви покогнат да използвате подходящия " "отстъп." -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Показвай интервали и табулации" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Отбелязва интервалите с точки и табулациите със стрелки." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Показвай края на редовете" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "Показва символа за край на ред" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 #, fuzzy msgid "Show line numbers" msgstr "Покажи _номерата на редовете" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Показва или скрива лентата с номерата на редовете" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 #, fuzzy msgid "Show markers margin" msgstr "Покажи _отстъпа за отбелязване" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2309,37 +2330,37 @@ "Показва или скрива малката лентичка (отстъп) от дясно на номерата на " "редовете, която се използва за отбелязване на редовете." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 #, fuzzy msgid "Stop scrolling at last line" msgstr "Компилирай текущия файл" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Покажи" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Отбелязвай дългите редове с:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Цвят на маркера за дълъг ред:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Задава цвета на маркера за дълъг ред" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Избери цвят" -#: ../src/interface.c:3826 +#: ../src/interface.c:3878 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2351,11 +2372,11 @@ "тази стойност на стойност по-голяма от 0, за да укажете къде да се появи " "тази права." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Ред" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2364,11 +2385,11 @@ "Принтира вертикална права в прозореца на редкактора на дадената позиция " "(вижте отдолу)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Фон" -#: ../src/interface.c:3846 +#: ../src/interface.c:3898 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2379,61 +2400,61 @@ "промея на цвета, зададен долу (Това се препоръчва ако използвате " "пропорционални шрифтове)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Изключен" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Маркер за дълъг ред" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 #, fuzzy msgid "Display" msgstr "Покажи" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 #, fuzzy msgid "Default end of line characters:" msgstr "Кодиране по подразбиране:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Нови·файлове" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 #, fuzzy msgid "Sets the default encoding for newly created files" msgstr "Задава кодирането по подразбиране на новосъздадените файлове." -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 #, fuzzy msgid "Default encoding (new files):" msgstr "Кодиране по подразбиране:" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 #, fuzzy msgid "Default encoding (existing files):" msgstr "Кодиране по подразбиране:" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "Задава кодирането по подразбиране на новосъздадените файлове." -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Използвай определено кодиране при отваряне на файлове." -#: ../src/interface.c:3978 +#: ../src/interface.c:4030 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " @@ -2444,83 +2465,83 @@ "отваряне на файлове и зарежда файла с точно определена кодировка (обикновено " "ненужно.)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 #, fuzzy msgid "Encodings" msgstr "Кодировка:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Сложи нов ред в края на файла" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 msgid "Ensures that at the end of the file is a new line" msgstr "Ако файлът не завършва с празен ред, такъв ще се вмъкне автоматично" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Махни излишните символи на края" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Премахва табулациите, интервалите в края на реда" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Замени табулацията с интервали" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Заменя всички табулации в документа с интервали" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Запазване на файлове" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Големина на списъка със скоро отваряни файлове:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Указва броя на файловете, които се съхраняват в списъка със скоро отваряни " "файлове:" -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Файлове" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Терминал:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Браузър:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Път и опции за програмата make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2528,24 +2549,24 @@ "Имитатор на терминал, подобно на xterm,·gnome-terminal·или·konsole (трябва " "да приема като аргумент -е)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Път (и вероятно допълнителни аргументи) към любимия ви браузър" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Пътища на инструментите" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 #, fuzzy msgid "Context action:" msgstr "Контекстно действие" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, fuzzy, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2555,73 +2576,73 @@ "Контекстна команда. Избраната дума може да бъде използвана с %s. Тя може да " "бъде навсякъде в дадената команда и ще бъде заменена преди изпълнението." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 #, fuzzy msgid "Commands" msgstr "" "\n" "Команди за тагове\n" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Инструменти" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "адрес на електронната поща на разработчика" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Инициали на името на разработчика" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 #, fuzzy msgid "Initial version:" msgstr "Първоначална версия:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Версия, която новия файл има по подразбиране" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Име на дружеството" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Разработчик:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Дружество:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Пощенски адрес:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Инициали:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Име на разработчика" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 #, fuzzy msgid "Year:" msgstr "Странична лента:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 #, fuzzy msgid "Date:" msgstr "Make:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4382 +#: ../src/interface.c:4434 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2631,7 +2652,7 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/interface.c:4389 +#: ../src/interface.c:4441 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2641,7 +2662,7 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/interface.c:4396 +#: ../src/interface.c:4448 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2651,69 +2672,69 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Информация за шаблона" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Шаблони" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 #, fuzzy msgid "C_hange" msgstr "Промени" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Клавишни комбинации" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Комбинации" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 #, fuzzy msgid "Command:" msgstr "Команда" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Път до командата за принтиране на файлове (използвайте %f за името на файла)." -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Използвай външна програма за принтиране" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 #, fuzzy msgid "Print line numbers" msgstr "Покажи _номерата на редовете" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Следвай пътя до текущия файл" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 #, fuzzy msgid "Print page numbers" msgstr "Покажи _номерата на редовете" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "Номерирай страниците в дъното. Отнема 2 реда." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 #, fuzzy msgid "Print page header" msgstr "Основен път:" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../src/interface.c:4575 ../src/printing.c:392 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2722,22 +2743,22 @@ "Добавя текст към началото на страницата, съдържащ номера на страницата, " "името на файла и отнема 3 реда (виж долу)." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 #, fuzzy msgid "Use the basename of the printed file" msgstr "Следвай пътя до текущия файл" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "Следвай пътя до текущия файл" -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 #, fuzzy msgid "Date format:" msgstr "Потребителски формат за дата" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../src/interface.c:4608 ../src/printing.c:422 #, fuzzy msgid "" "Specify a format for the date and time stamp which is added to the page " @@ -2748,591 +2769,610 @@ "всякакви общоприети начини на изписване, които могат да бъдат използвани с " "ANSI·C функцията strftime . За повече подробности, вижте \"man·strftime\"" -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Използвай отпечатването на GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 #, fuzzy msgid "Printing" msgstr "Разпечатай (принтирай)" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Свойства на проекта" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 #, fuzzy msgid "File" msgstr "_Файл" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Нов" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Отвори" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Отвори избрания файл" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Запази" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Запази като" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Запази всички" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Разпечатай (принтирай)" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Затвори" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Затвори всички" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Презареди файла" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 #, fuzzy msgid "Project" msgstr "_Проект" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Свойства на проекта" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Отмени" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Направи отново" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Удвои ред или избраното" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 #, fuzzy msgid "Delete current line(s)" msgstr "Затвори текущия файл" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "Затвори текущия файл" + +#: ../src/keybindings.c:244 #, fuzzy msgid "Transpose current line" msgstr "Принтира текущия файл" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 #, fuzzy msgid "Scroll to current line" msgstr "Компилирай текущия файл" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 #, fuzzy msgid "Scroll up the view by one line" msgstr "Компилирай текущия файл" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Прелисти надолу с един ред" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 #, fuzzy msgid "Complete snippet" msgstr "Завърши блока" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 #, fuzzy msgid "Suppress snippet completion" msgstr "Не завършвай блоковете" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Контекстно действие" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Завърши думата" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Покажи сподсказка" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Покажи списъка с макроси" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Изрежи" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 #, fuzzy msgid "Copy" msgstr "Дружество:" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Постави" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 #, fuzzy msgid "Copy current line(s)" msgstr "Компилирай текущия файл" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 #, fuzzy msgid "Cut current line(s)" msgstr "Затвори текущия файл" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 #, fuzzy msgid "Select" msgstr "Избери всичко" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Избери всичко" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Избери текущата дума" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 #, fuzzy msgid "Select current line(s)" msgstr "Избери текущата дума" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 #, fuzzy msgid "Select current paragraph" msgstr "Избери текущата дума" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 #, fuzzy msgid "Format" msgstr "_Формат" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 #, fuzzy msgid "Toggle Case of Selection" msgstr "Коментирай/откоментирай реда" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Коментирай/откоментирай реда" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Коментирай ред(ове)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Откоментирай ред(ове)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Увеличи отстъпа" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Намали отстъпа" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 #, fuzzy msgid "Increase indent by one space" msgstr "Увеличи отстъпа" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 #, fuzzy msgid "Decrease indent by one space" msgstr "Намали отстъпа" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Умно вмъкване на реда" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Изпрати на потребителска команда 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Изпрати на потребителска команда 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Изпрати на потребителска команда 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "Из_прати избрания текст на" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 #, fuzzy msgid "Insert" msgstr "_Вмъкни" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Вмъкни дата" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 #, fuzzy msgid "Insert alternative white space" msgstr "Вмъкни другия празен символ" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 #, fuzzy msgid "Settings" msgstr "Раздел" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 #, fuzzy msgid "Search" msgstr "Тър_си" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Намери" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Намери следващото" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Намери предишното" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Намери следващото избрано" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Намери предишното избрано" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Замени" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 #, fuzzy msgid "Find in Files" msgstr "Намери въф _файлове" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Следващо съобщение" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 #, fuzzy msgid "Previous Message" msgstr "Следващо съобщение" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Намери къде се използва" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 #, fuzzy msgid "Find Document Usage" msgstr "Намери къде се използва" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "_Направи всички (make)" + +#: ../src/keybindings.c:369 #, fuzzy msgid "Go to" msgstr "Прескочи до ред" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 #, fuzzy msgid "Navigate back a location" msgstr "Върни назад" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 #, fuzzy msgid "Navigate forward a location" msgstr "Премести напред" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 #, fuzzy msgid "Go to matching brace" msgstr "Отиди до съвпадащата скоба" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Включи/изключи маркера" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 #, fuzzy msgid "Go to next marker" msgstr "Отиди до следващия маркер" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 #, fuzzy msgid "Go to previous marker" msgstr "Отиди до предишния маркер" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Отиди до дефиницията на тага" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Отиди до декларацията на тага" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 #, fuzzy msgid "Go to Start of Line" msgstr "Прескочи до ред" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 #, fuzzy msgid "Go to End of Line" msgstr "Прескочи до ред" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Прескочи до ред" + +#: ../src/keybindings.c:400 #, fuzzy msgid "Go to Previous Word Part" msgstr "Отиди до предишния маркер" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 #, fuzzy msgid "Go to Next Word Part" msgstr "Отиди до следващия маркер" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Изглед" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 #, fuzzy msgid "Toggle All Additional Widgets" msgstr "Промяеня всички допълнителни джаджи" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Цял екран" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Покажи/скрий прозореца за съобщения" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Покажи/скрий страничната лента" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Увеличи шрифта" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Намали шрифта" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Превключи към редактора" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Превключи към бележника" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Превключи към конзолата" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Превключи към страничната лента" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 #, fuzzy msgid "Switch to Sidebar" msgstr "Превключи към страничната лента" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 #, fuzzy msgid "Switch to Compiler" msgstr "Превключи към страничната лента" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 #, fuzzy msgid "Notebook tab" msgstr " команди" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Превключи към левия документ" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Превключи към десния документ" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Превключи към последно-използвания документ" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 #, fuzzy msgid "Move document left" msgstr "цял документ" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 #, fuzzy msgid "Move document right" msgstr "цял документ" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 #, fuzzy msgid "Move document first" msgstr "цял документ" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 #, fuzzy msgid "Move document last" msgstr "цял документ" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 #, fuzzy msgid "Document" msgstr "_Документ" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 #, fuzzy msgid "Toggle Line wrapping" msgstr "Пренасяне на редове" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 #, fuzzy msgid "Toggle Line breaking" msgstr "Об_ърни коментирането на реда" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 #, fuzzy msgid "Replace spaces by tabs" msgstr "_Замени табулациите с интервали" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 #, fuzzy msgid "Toggle current fold" msgstr "Избери текущата дума" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Сгъни всички" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Отсгъни всички" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Презареди списъка със символите" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Построй" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Компилирай" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Направи всички" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Направи потербителска цел" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Направи обект" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Следваща грешка" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 #, fuzzy msgid "Previous error" msgstr "Преводачи" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Изпълни" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Изпълни (друга команда)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Настройки на построяването" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 #, fuzzy msgid "Show Color Chooser" msgstr "Покажи избор на цвят" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 #, fuzzy msgid "Help" msgstr "_Помощ" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 #, fuzzy msgid "Keyboard Shortcuts" msgstr "Кл_авишни комбинации" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 #, fuzzy msgid "The following keyboard shortcuts are configurable:" msgstr "Следните клавишни комбинации са определени:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 #, fuzzy msgid "Switch to Document" msgstr "Превключи към левия документ" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Въведете тук каквото желаете, използвайте го като бележник" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Не успях да отворя един или повече от сесийните файлове" -#: ../src/log.c:177 +#: ../src/log.c:181 #, fuzzy msgid "Debug Messages" msgstr "Съобщения" @@ -3399,7 +3439,7 @@ msgstr "Отпечатай инсталационната представка на Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "не зареждай файловете от предишната сесия" #: ../src/main.c:143 @@ -3417,24 +3457,24 @@ msgid "Show version and exit" msgstr "покажи версията и излез" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[Файлове...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3443,14 +3483,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3461,22 +3501,22 @@ "Може да възникат проблеми с Geany без конфигурационна директория.\n" "Да стартирам ли Geany все пак?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "Не можах да намеря файла '%s'." -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Това е Geany·%s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Не можах да създам конфигурационната директория (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 #, fuzzy msgid "Configuration files reloaded." msgstr "Не успях да компилирам." @@ -3494,19 +3534,19 @@ msgid "_Hide Message Window" msgstr "_Скрий прозореца за съобщенията" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 #, fuzzy msgid "_Plugin Manager" msgstr "Управител на приставките" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3517,24 +3557,24 @@ "Описание: %s\n" "Автор(и): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 #, fuzzy msgid "Active" msgstr "Действие" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Приставка" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Няма налични приставки." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Приставки" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3542,53 +3582,63 @@ "Наличните приставки са изброени в списъка долу. Изберете тези, които искате " "да се заредят със стартирането на Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 #, fuzzy msgid "Plugin details:" msgstr "Контекстна команда" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Действие" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Комбинация" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 #, fuzzy msgid "Grab Key" msgstr "Клавиш за улавяне" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, fuzzy, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Въведете комбинацията от клавиши, която желаете да използвате за \"%s\"" -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +#, fuzzy +msgid "_Expand All" +msgstr "Намери всички" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +#, fuzzy +msgid "_Collapse All" +msgstr "_Затвори Всички" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Действие" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Комбинация" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Предефиниране" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Да предефинирам ли тази клавишна комбинация?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, fuzzy, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Комбинацията '%s' е вече заето от \"%s\". Моля изберете друга." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Въведето пътеките до инструментите отдилу. Тези, от които не се нуждаете, " "можете да оставите празни." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3596,7 +3646,7 @@ "Въведете информацията, която да бъде използвана в шаблоните. Вижте " "документацията за подробности." -#: ../src/prefs.c:1458 +#: ../src/prefs.c:1523 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3607,7 +3657,7 @@ "рестартирате Geany." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3619,7 +3669,7 @@ "кобинацията направо." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3628,64 +3678,65 @@ "е построен с GTK 2.10 (и по-нови) и Geany използва GTK 2.10 (и по-" "нов)." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -#: ../src/printing.c:270 +#: ../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 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Променен:" -#: ../src/printing.c:340 +#: ../src/printing.c:375 #, fuzzy msgid "Document Setup" msgstr "" "\n" "Меню документ\n" -#: ../src/printing.c:375 +#: ../src/printing.c:410 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "Следвай пътя до текущия файл" -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Променен:" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, fuzzy, c-format msgid "Printing of file %s was cancelled." msgstr "Не успях да принтирам \"%s\" (програмата завърши с: %s)" -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Принтирах файла %s." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, fuzzy, c-format msgid "Printing of %s failed (%s)." msgstr "Не успях да принтирам \"%s\" (програмата завърши с: %s)" -#: ../src/printing.c:832 +#: ../src/printing.c:867 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "" "Моля първо въведете команда за отпечатване в прозореца с предпочитанията." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3696,7 +3747,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Не успях да принтирам \"%s\" (програмата завърши с: %s)" @@ -3715,19 +3766,19 @@ msgid "C_reate" msgstr "С_ъздай" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Име:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Име на файла:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Основен път:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../src/project.c:171 ../src/project.c:438 #, fuzzy msgid "" "Base directory of all files that make up the project. This can be a new " @@ -3737,42 +3788,42 @@ "Основната директория на всички файлове, които съставят проекта. Това може да " "бъденов път или вече съществуваща йерархия от директории." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Изберете основен път за проекта" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Не можах да заредя файла \"%s\" на проекта." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Отвори проект" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Файлове на проекта" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Затворих проекта ·\"%s\"." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Описание:" -#: ../src/project.c:443 +#: ../src/project.c:447 #, fuzzy msgid "Make in base path" msgstr "Направи в основната директория" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Команда за изпълнение:" -#: ../src/project.c:457 +#: ../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." @@ -3781,81 +3832,81 @@ "могат да се прибавят към командата. Оставете празно, за да се изпълни " "командата по подразбиране." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Файлови образци:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Искате ли да го затворите преди да продължите?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, fuzzy, c-format msgid "The '%s' project is already open." msgstr "Проектът '%s' е вече отворен." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Даденото име е прекалено късо." -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Даденото име е прекалено дълго (най-много %d символа)." -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Избрали сте неправилно име за проекта." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Да създам ли основната директория на проекта?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Пътят \"%s\" не съществува." -#: ../src/project.c:666 +#: ../src/project.c:670 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Не можах да създам конфигурационната директория (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, fuzzy, c-format msgid "Project file could not be written (%s)." msgstr "Не можах да запиша файла на проекта." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Създадох проекта \"%s\"." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Запазих проекта \"%s\"." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Изберете име за проекта" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Изберете команда за изпълнение на проекта" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Отворих проекта \"%s\"." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "_Използвай редовни изрази" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3863,16 +3914,16 @@ "Използвай изрази в стил POSIX. За по-подробна информация за редовните изрази," "моля прочетете документацията." -#: ../src/search.c:212 +#: ../src/search.c:227 #, fuzzy msgid "Search _backwards" msgstr "_Търси назад" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Използвай _escape·sequences" -#: ../src/search.c:231 +#: ../src/search.c:246 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3881,421 +3932,431 @@ "Замени ·\\\\,·\\t, \\n, \\r·и·\\uXXXX·(Unicode·символи)·със съответните " "контролни символи." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 #, fuzzy msgid "C_ase sensitive" msgstr "_Зачитане на малки/големи букви" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Само _ако съвпада с цяла дума" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Само ако съвпада с _началото на думата" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Предишен" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Следващ" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 #, fuzzy msgid "_Search for:" msgstr "Търси за:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 #, fuzzy msgid "_Find All" msgstr "Намери всички" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Отбележи" -#: ../src/search.c:418 +#: ../src/search.c:433 #, fuzzy msgid "Mark all matches in the current document" msgstr "Отбелязва всички съвпадения в текущия документ." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "В _Сесията" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "В _Документа" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Затвори _прозореца" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Забранете тази опция, за да оставите прозореца отворен." -#: ../src/search.c:514 +#: ../src/search.c:529 #, fuzzy msgid "Replace & Fi_nd" msgstr "За_мени и намери" -#: ../src/search.c:523 +#: ../src/search.c:538 #, fuzzy msgid "Replace wit_h:" msgstr "Замени със:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 #, fuzzy msgid "Re_place All" msgstr "Замени всички" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "В _избраното" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Замени всички намерени съвпадени е избрания текст" -#: ../src/search.c:681 +#: ../src/search.c:696 #, fuzzy msgid "_Directory:" msgstr "Директория:" -#: ../src/search.c:712 +#: ../src/search.c:727 #, fuzzy msgid "E_ncoding:" msgstr "Задайте знаково кодиране:" -#: ../src/search.c:737 +#: ../src/search.c:752 #, fuzzy msgid "Fixed s_trings" msgstr "С _точно определена големина" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Редовни изрази за _Grep" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 #, fuzzy msgid "See grep's manual page for more information" msgstr "Виж страницата на ръководството на grep за повече информация." -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Разширение редовни изрази" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Рек_урсивно в поддиректории" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "О_бърни наопъки резултатие от търсенето" -#: ../src/search.c:782 +#: ../src/search.c:797 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Обърни наопъки логиката за търсене на съвпадения, за да изберете не-" "съвпадащите редове." -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Д_опълнителни настройки:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Други опции, които да се предадат на Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 #, 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:1184 +#: ../src/search.c:1203 #, fuzzy, c-format msgid "Replaced text in %u file." msgid_plural "Replaced text in %u files." msgstr[0] "Замених текст в %u файла." msgstr[1] "Замених текст в %u файла." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Неправилна директория за търсене във файлове." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Няма текст, който да се търси." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Не мога да стартирам програмата grep: '%s'; проверете настройката за пътя в " "Предпочитания" -#: ../src/search.c:1400 +#: ../src/search.c:1419 #, fuzzy msgid "Searching..." msgstr "Тър_си" -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s·%s·--·%s·(в директория:·%s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Не можах да отворя директорията (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Не открих съвпадения." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Глава" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Раздел" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Разд1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Разд2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Разд3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Приложение" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Модул" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 #, fuzzy msgid "Types" msgstr "Вид:" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 #, fuzzy msgid "Type constructors" msgstr "Завърши блока" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 #, fuzzy msgid "Sections" msgstr "Раздел" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Команда" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Среда" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Подраздел" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Под-подраздел" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Надпис" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 #, fuzzy msgid "Structures" msgstr "Състояние" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Пакет" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Мой" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Местен" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Наш" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Константи" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 #, fuzzy msgid "ID Selectors" msgstr "В _избраното" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 #, fuzzy msgid "Type Selectors" msgstr "Завърши блока" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Modules" msgstr "Модул" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Namespaces" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Свойства" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Изнеси" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Членове" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 #, fuzzy msgid "Labels" msgstr "Надпис" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Макроси" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 #, fuzzy msgid "Defines" msgstr "Линии:" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Namespaces" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 #, fuzzy msgid "Structs" msgstr "Състояние" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Непознато разширение за \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, fuzzy, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Не успях да създам файл с тагова.\n" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4304,7 +4365,7 @@ "Употреба: %s·-g··<Списък от файлове>\n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4315,182 +4376,190 @@ "CFLAGS=`pkg-config·gtk+-2.0·--cflags`·%s·-g·gtk2.c.tags·/usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Зареди таговете" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Таговови файлове на Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Заредих·%s·таг файл·'%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Не можах да заредя таг-файла '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Не можах да намеря предварителната декларация на %s." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Не успях да намеря дефиницята на %s." -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "Намери всички" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "_Затвори Всички" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 #, fuzzy msgid "Sort by _Name" msgstr "Външен вид" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 #, fuzzy msgid "Sort by _Appearance" msgstr "Външен вид" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Запази текущия файл" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "Запази _всички" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Запази всички отворени файлове" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Презареди текущия файл от диска" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Затвори текущия файл" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 #, fuzzy msgid "Close all open files" msgstr "Затваря всички отворени файлове" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 #, fuzzy msgid "Cut the current selection" msgstr "Обърни малки/главни букви в избрания текст" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 #, fuzzy msgid "Copy the current selection" msgstr "Компилирай текущия файл" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 #, fuzzy msgid "Delete the current selection" msgstr "Обърни малки/главни букви в избрания текст" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Отмени последната промяна" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Направи отново послената промяна" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Компилирай текущия файл" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Изпълни или прегледай текущия файл" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Отваря диалогов прозорец за да изберете цвят от палитрата." -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Увеличи размера на шрифта" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Намали размера на шрифта" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 #, fuzzy msgid "Decrease indentation" msgstr "Намали отстъпа" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 #, fuzzy msgid "Increase indentation" msgstr "Увеличи отстъпа" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Намери въведения текст в текуция файл" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 #, fuzzy msgid "Jump to the entered line number" msgstr "Прескача до въведения ред." -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Излез от Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "XML документ" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Отбелязва всички съвпадения в текущия документ." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Създай нов файл" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Отвори съществуващ файл" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 #, fuzzy 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 "Покажи" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4556,130 +4625,152 @@ msgid "Characters:" msgstr "Символи:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Не намерих тагове." -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 #, fuzzy msgid "Show S_ymbol List" msgstr "Покажи списъка със символите" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 #, fuzzy msgid "Show _Document List" msgstr "Показвай списък с отворените файлове" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 #, fuzzy msgid "H_ide Sidebar" msgstr "Скрий страничната лента" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Покажи _целия път" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "ред: %d\t кол: %d\t избр: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "ТАБУЛАЦИЯ" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 #, fuzzy msgid "SP" msgstr "ИНТЕРВАЛ" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "Задайте кодирането:" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "filetype: %s" msgstr "Задай тип на файла:" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Шрифтът е обновен (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Стандартна библиотека на С" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO·C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++·(стандартна С библиотека )" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Стандартна С++ библиотека" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++·STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 #, fuzzy msgid "_Set Custom Date Format" msgstr "Задайте потребителски формат за дата" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Изберете папка" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Изберете файл" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 #, fuzzy msgid "C_onfiguration Files" msgstr "Не успях да компилирам." -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +#, fuzzy +msgid "Save All" +msgstr "Запази _всички" + +#: ../src/ui_utils.c:1786 #, fuzzy 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 "Терминал" @@ -4860,180 +4951,164 @@ "Да изпълнявам програмите във VTE, вместо да отварям прозорец на терминален " "емулатор. Моля обърнете внимание, че такива програми не могат да се спират." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Проектни файлове на Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Изпълними файлове" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Грешка" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Въпрос" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Предупреждение" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Информация" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 #, fuzzy msgid "Class Builder" msgstr "Класове" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Създай изходни файлове за нови видове класове." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 #, fuzzy msgid "Create Class" msgstr "С_ъздай" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 #, fuzzy msgid "Class" msgstr "Класове" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 #, fuzzy msgid "Class name:" msgstr "Класове" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 #, fuzzy msgid "Header file:" msgstr "Презареди файла" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 #, fuzzy msgid "Source file:" msgstr "Изходен файл на С" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 #, fuzzy msgid "Inheritance" msgstr "Интерфейс" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 #, fuzzy msgid "Base class:" msgstr "Основен път:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 #, fuzzy msgid "Base header:" msgstr "Основен път:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Глобални" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 #, fuzzy msgid "Base GType:" msgstr "Основен път:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 #, fuzzy msgid "Options" msgstr "Функции" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 #, fuzzy msgid "Create constructor" msgstr "Завърши блока" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 #, fuzzy msgid "Create destructor" msgstr "Завърши блока" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Конструктор тип GTK+ " -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 #, fuzzy msgid "Create Cla_ss" msgstr "С_ъздай" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 #, fuzzy msgid "_C++ Class" msgstr "Класове" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 #, fuzzy msgid "_GTK+ Class" msgstr "Класове" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 #, fuzzy msgid "HTML Characters" msgstr "HTML·символи" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Вмъква HTML символи като '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 +#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/splitwindow.c:37 #, fuzzy msgid "The Geany developer team" msgstr "Име на разработчика" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML·символи" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO·8859-1·символи" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Гръцки букви" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Математически знаци" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Технически символи" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Знаци за стрелки" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Пунктуационни знаци" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Други символи" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 #, fuzzy msgid "Special Characters" msgstr "Специялни символи" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Вмъкни" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -5041,172 +5116,172 @@ "Избери специален символ от списъка долу и щракнете два пъти върху него или " "използвайтебутона за да го въведете в текущата позиция на курсора." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Символ" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML·(име)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_Вмъкни специални HTML символи" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "Замени" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Положение на подпрозорците с нови файлове:" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Вмъкни специални HTML символи" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "Специялни символи" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 #, fuzzy msgid "Toggle plugin status" msgstr "Коментирай/откоментирай реда" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Изнеси" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 #, fuzzy msgid "Exports the current file into different formats." msgstr "Компилира текущия файл в тип DVI" -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 #, fuzzy msgid "Export File" msgstr "Отвори файл" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Използвай сегашното ниво на приближение" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 #, fuzzy msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" "Свързва размера на шрифта на документа със сегашното ниво на приближение." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Документът бе успешно изнесен като '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, fuzzy, c-format msgid "File '%s' could not be written (%s)." msgstr "Не можах да запиша файла на проекта." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл с име '%s' вече съществува. Искате ли да го презапишете?" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "Изн_еси" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 #, fuzzy msgid "As _HTML" msgstr "Като HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 #, fuzzy msgid "As _LaTeX" msgstr "Като LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 #, fuzzy msgid "File Browser" msgstr "Файлов браузър:" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Добавя отстрани под-прозорец на файлов браузър" -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Прекалено много неща са избрани!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Грешка при изпълнението на външната команда '%s' (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Отвори _външно" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 #, fuzzy msgid "_Find in Files" msgstr "Намери във _файлове" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 #, fuzzy msgid "Show _Hidden Files" msgstr "Покажи _скритите файлове" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Нагоре" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Презареди" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 #, fuzzy msgid "Home" msgstr "Домашна директория" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 #, fuzzy msgid "Set path from document" msgstr "Задай пътя на текущия документ" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 #, fuzzy msgid "Clear the filter" msgstr "Изчисти текущия филтър" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 #, fuzzy msgid "Filter:" msgstr "_Филтър" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Фокус на файловия лист" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 #, fuzzy msgid "Plugin configuration directory could not be created." msgstr "Не можах да създам конфигурационна директория (%s) за плъгина." @@ -5250,7 +5325,7 @@ #: ../plugins/filebrowser.c:1128 #, fuzzy -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "Да създам ли основната директория на проекта?" #: ../plugins/filebrowser.c:1132 @@ -5259,33 +5334,33 @@ "Change the directory to the base directory of the currently opened project" msgstr "Направи diff от директорията на активния файл в момента" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 #, fuzzy msgid "Save Actions" msgstr "Раздел" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" "Този плъгин предоставя различни екстри, свързани с запазването на файлове." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, fuzzy, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Не можах да създам конфигурационната директория (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, fuzzy, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Не можах да запиша файла на проекта." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, fuzzy, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Backup копиране: Файлът (%s) не може да бъде записан ." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, fuzzy, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5293,116 +5368,134 @@ msgstr[1] "Автоматично записване: %d файла бяха успешно заисани." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 #, fuzzy msgid "Select Directory" msgstr "Избери Директория" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Backup директорията не съществува или няма права за писане в нея." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 #, fuzzy msgid "Auto Save" msgstr "Автоматично Запазване" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Разреши" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "Интервал за автоматично запазване" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 #, fuzzy msgid "seconds" msgstr "команди" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 #, fuzzy msgid "_Print status message if files have been automatically saved" msgstr "" "Отпечатва съобщение ако файловете са били успешно запазени автоматично." -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 #, fuzzy msgid "Save only current open _file" msgstr "Запази текущия файл" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 #, fuzzy msgid "Sa_ve all open files" msgstr "Запази всички отворени файлове" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 #, fuzzy msgid "Instant Save" msgstr "Вмъкни дата" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 #, fuzzy msgid "_Filetype to use for newly opened files:" msgstr "Задава кодирането по подразбиране на новосъздадените файлове." -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Backup копие" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Избери директория за запазване на backup файловете:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" "Дата/времеви формат за backup файловете (виж \"man strftime\" за повече " "детайли):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Нивата на директорията в backup дестинацията:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Раздели прозореца" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Раздели редактора на два отделни прозореца" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Отбелязва всички съвпадения в текущия документ." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Събери редактора" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Раздели прозореца" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Хоризонтално" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 #, fuzzy msgid "Split Horizontally" msgstr "_Хоризонтално" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 #, fuzzy msgid "Unsplit" msgstr "_Събери редактора" +#~ msgid "Diff file" +#~ msgstr "Diff файл" + +#~ msgid "reStructuredText file" +#~ msgstr "преСтруктуриранТекстови файл" + +#~ msgid "Select _All" +#~ msgstr "Избор на вси_чко" + +#, fuzzy +#~ msgid "Automatic symbol completion" +#~ msgstr "Автоматично завършване на символи" + #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Грешка при показването на %s (проверете дали не е вече компилирано)" @@ -5702,9 +5795,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Structs·/·Typedefs" -#~ msgid "Show _Full Path Name" -#~ msgstr "Покажи _целия път" - #~ msgid "Terminal emulation:" #~ msgstr "Терминална имитация:" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/ca.po /tmp/ssBwSf4GIv/geany-0.18/po/ca.po --- geany-0.17/po/ca.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/ca.po 2009-08-16 17:18:28.000000000 +0100 @@ -1,15 +1,15 @@ # Catalan translations for Geany package. # Copyright (C) 2007 by Geany's COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# toni , 2007, 2008. +# toni , 2007-2009. # # msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" -"PO-Revision-Date: 2009-02-08 19:10+0100\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"PO-Revision-Date: 2009-08-12 23:58+0100\n" "Last-Translator: Toni Garcia-Navarro \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -29,67 +29,67 @@ msgid "Integrated Development Environment" msgstr "Entorn Integrat de Desenvolupament" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Quant a Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Un IDE lleuger i veloç" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(compilat el %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Informació" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Desenvolupadors" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "mantenidor" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "desenvolupador" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "coordinador de traduccions" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Traductors" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Antics Traductors" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Col·laboradors" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Crèdits" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Llicència" -#: ../src/about.c:389 +#: ../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." @@ -97,7 +97,7 @@ "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:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -106,134 +106,134 @@ "No s'ha trobat el terminal '%s' (comproveu la ruta del Terminal a les " "Preferències)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Ha fallat el procés (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (al directori: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, 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:731 +#: ../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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Ha fallat la compilació." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "La compilació ha acabat sense errors." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Compila" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make _Object" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Error Següent" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Error _Anterior" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "E_specifica 'Includes' i Arguments" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_Visualitza DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "V_isualitza el PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "E_specifica els Arguments" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Especifica els Arguments" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Creació del DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Creació del PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "previsualització del DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "previsualització del PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -242,67 +242,67 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Especifica 'Includes' i Arguments" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Especifica les ordres per muntar i executar els programes." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s ordres" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Compila:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Munta:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Execució:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Compila el fitxer" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make..." -#: ../src/build.c:1927 +#: ../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:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Compila el fitxer actual amb l'eina Make" -#: ../src/build.c:2044 +#: ../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:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "No es pot aturar el procés (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "No hi ha més errors de compilació." @@ -310,8 +310,8 @@ msgid "Do you really want to quit?" msgstr "Esteu segurs de voler sortir?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "A_ctualitza" @@ -324,52 +324,52 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Esteu segurs que voleu actualitzar '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Vés a la Línia" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Introdueix la línia on vols anar:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../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:1479 ../src/ui_utils.c:560 +#: ../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:1481 ../src/ui_utils.c:561 +#: ../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:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Usa Format de Data Propi" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Format de Data" -#: ../src/callbacks.c:1495 +#: ../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." @@ -377,24 +377,24 @@ "Indiqueu el format de la data i l'hora. Podeu utilitzar qualsevol variable " "suportada per la funció ANSI C strftime." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "No hi ha més missatges." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Obre un Fitxer" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Visualitza" -#: ../src/dialogs.c:150 +#: ../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." @@ -402,29 +402,28 @@ "Obre el fitxer en mode només lectura. Si trieu més d'un fitxer, tots seran " "oberts en aquest mode." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Detecta per l'extensió del fitxer" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Detecta pel fitxer" -#: ../src/dialogs.c:259 -#, fuzzy +#: ../src/dialogs.c:258 msgid "_More Options" -msgstr "Opcions" +msgstr "_Més Opcions" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Mostra els fitxers _ocults" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Estableix la codificació dels caràcters:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -438,11 +437,11 @@ "Si trieu més d'un fitxer, tots s'obriran amb aquesta codificació." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Especifica el tipus de fitxer:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -452,23 +451,31 @@ "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." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "_Sobrescrire?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "El nom del fitxer ja existeix!" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Desa el Fitxer" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "R_eanomena" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Desa el fitxer i reanomena'l" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Obre un fitxer en una pestanya nova" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -476,24 +483,41 @@ "Mantingues el document actual sense desar i obre el fitxer desat en una " "pestanya nova." -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Error" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Pregunta" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Advertència" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informació" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_No desis" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "El fitxer '%s' no s'ha desat." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Voleu desar abans de tancar?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Tria la font" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -501,106 +525,106 @@ "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:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "desconegut" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Propietats" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Tipus:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Mida:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Ubicació:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Només lectura:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(només dins Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Codificació:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(amb BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(sense BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Modificat:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Canviat:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Accedit:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Permisos:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Lectura:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Escriptura:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Propietari:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Grup:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Altres:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Fitxer %s tancat." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "S'ha obert el fitxer nou \"%s\"." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "No s'ha pogut obrir el fitxer %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -615,12 +639,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "El fitxer \"%s\" no és %s vàlid." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -629,49 +653,51 @@ "El fitxer \"%s\" no sembla un fitxer de text o la codificació no està " "suportada." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Espais" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabulacions" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Activant mode de sagnat %s per a %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Nom de fitxer invàlid" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "S'ha actualitzat el fitxer %s." -#: ../src/document.c:1354 +#. 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 "S'ha obert el fitxer %s (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", només lectura" -#: ../src/document.c:1561 -#, fuzzy +#: ../src/document.c:1512 msgid "Error renaming file." -msgstr "S'ha produït un error en desar el fitxer." +msgstr "S'ha produït un error en renomenar el fitxer." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -680,7 +706,7 @@ "S'ha produït un error en convertir el fitxer de UTF-8 a \"%s\". El fitxer no " "s'ha desat." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -689,52 +715,52 @@ "Missatge d'error: %s\n" "Error en \"%s\" (línia: %d, columna: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Missatge d'error: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "S'ha produït un error en desar el fitxer." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "S'ha produït un error en desar el fitxer (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "S'ha desat el fitxer %s." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "No s'ha trobat \"%s\"" -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Tornar a començar la cerca des del principi?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "No s'ha trobat '%s'." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: 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:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Voleu actualitzar-la?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -743,32 +769,20 @@ "El fitxer '%s' al disc és més recent que\n" "l'actual en memòria." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Intentar desar el fitxer de nou?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "No s'ha trobat \"%s\" al disc!" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Amplada de la Tabulació:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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ó." @@ -870,133 +884,122 @@ msgstr "Xinè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:141 ../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à" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Sense codificació" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "Europeu _occidental" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Europeu oriental" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "_Asiàtic oriental" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "Asiàtic _sud-oriental i sud-occidental" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "Orient _Mitjà" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Cap" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Codi font %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "fitxer %s" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Cap" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Fitxer de Script" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Document XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Full d'estil en cascada (CSS)" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "Fitxer SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Fitxer de diferències" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Fitxer de configuració" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Fitxer de traduccions de gettext" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "fitxer de script %s" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Fitxer reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Llenguatges de _Programació" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Llenguatges de _Script" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Llenguatges de _Marcatge" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Llenguatges _Diversos" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Tot Codi Font" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Tots els fitxers" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expressió regular incorrecta per al tipus de fitxer %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "sense títol" @@ -1010,8 +1013,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "invisible" @@ -1019,7 +1022,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Obre el F_itxer Seleccionat" @@ -1039,11 +1042,11 @@ msgid "Page Set_up" msgstr "_Configuració de la pàgina" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Tanca Altres _Documents" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "_Tanca-ho Tot" @@ -1051,91 +1054,85 @@ msgid "_Edit" msgstr "_Edita" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Selecciona-ho _Tot" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Formata" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "C_anvia la Caixa de la Selecció" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Comenta la Línia" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "_Descomenta la Línia" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Activa o Desactiva els Comentaris de _Línia" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "_Incrementa el Sagnat" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "_Redueix el Sagnat" -#: ../src/interface.c:526 ../src/interface.c:1995 -#, fuzzy +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" -msgstr "_Envia la Selecció a..." +msgstr "_Envia la Selecció al Terminal" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Envia la Selecció a..." -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "I_nsereix Comentari" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Insereix Entrada al _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Insereix C_apçalera de Fitxer" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Insereix Descripció de la _Funció" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Insereix Comentari _Multilínia" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Insereix Text _GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Insereix Text de Llicència _BSD" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Insereix _Data" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "_Insereix \"include <...>\"" #: ../src/interface.c:613 -#, fuzzy msgid "Preference_s" -msgstr "Preferències" +msgstr "Preferèncie_s" #: ../src/interface.c:621 msgid "_Search" @@ -1153,7 +1150,7 @@ msgid "Find in F_iles" msgstr "Cerca en els F_itxers" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Reemplaça" @@ -1173,7 +1170,7 @@ msgid "Pr_evious Message" msgstr "Missatge _Anterior" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "_Vés a la Línia" @@ -1201,7 +1198,7 @@ msgid "Show Side_bar" msgstr "Mostra la _Barra Lateral" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1245,15 +1242,15 @@ msgid "In_dent Type" msgstr "Tipus de Sagnat" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tabulacions" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "E_spais" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_abulacions i Espais" @@ -1330,9 +1327,8 @@ msgstr "_Obrir" #: ../src/interface.c:955 -#, fuzzy msgid "_Recent Projects" -msgstr "Obre un Projecte" +msgstr "Projectes _Recents" #: ../src/interface.c:959 msgid "_Close" @@ -1374,7 +1370,7 @@ msgid "_Debug Messages" msgstr "Missatges de _Depuració" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Símbols" @@ -1398,72 +1394,75 @@ msgid "Scribble" msgstr "Notes" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Imatges _i Text" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Només _Imatges" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Només _Text" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Icones _Grans" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Icones _Xicotetes" -#: ../src/interface.c:1760 ../src/interface.c:3306 -#, fuzzy +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" -msgstr "Icones _Xicotetes" +msgstr "Icones _Molt Xicotetes" + +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "_Personalitza la Barra d'Eines" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" -msgstr "A_maga barra d'eines" +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" +msgstr "A_maga la Barra d'Eines" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Ús de la _Cerca" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Ús de la Cerca de Documents" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Vés a la Definició de l'_Etiqueta" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Vés a la _Declaració de l'Etiqueta" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Acció Conte_xtual" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Preferències" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Carrega els fitxers de l'última sessió" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Obre a l'inici els fitxers de l'última sessió" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Carrega l'emulació de terminal virtual" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1471,39 +1470,39 @@ "Indica si l'emulació de terminal virtual (VTE) s'ha de carregar a l'inici. " "Desactiva-ho si no et cal" -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Activa el suport de connectors" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Inici" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Conserva la mida i posició de la finestra" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Confirma la sortida" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Mostra un diàleg de confirmació en sortir" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Tancament" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Directori base:" -#: ../src/interface.c:2758 +#: ../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." @@ -1511,39 +1510,41 @@ "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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Fitxers del projecte:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Directori on començar quan s'obren fitxers del projecte" -#: ../src/interface.c:2796 -#, fuzzy +#: ../src/interface.c:2816 msgid "Extra plugin path:" -msgstr "Activa el suport de connectors" +msgstr "Ruta de connectors:" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Rutes" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Inici" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Avís sonor als errors o quan finalitza la compilació" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1551,11 +1552,11 @@ "Indica si cal emetre un so quan apareix un error o quan finalitza el procés " "de compilació" -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 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:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1563,11 +1564,11 @@ "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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "No mostris els missatges d'estat a la barra d'estat" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1575,11 +1576,11 @@ "Suprimeix tots els missatges de la barra d'estat. Els missatges encara es " "mostraran a la finestra de missatges d'estat." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofocus (el focus segueix el ratolí)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1589,15 +1590,15 @@ "principal, el bloc de notes, els camps de la barra d'eines i l'Emulador de " "Terminal." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Miscel·lània" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 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:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1605,11 +1606,11 @@ "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:2893 +#: ../src/interface.c:2913 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:2896 +#: ../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" @@ -1617,19 +1618,19 @@ "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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Cerca" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Usa fitxers de sessió basats en projecte" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1637,12 +1638,11 @@ "Indica si es desaran fitxers de sessió de projecte i si s'obriran en reobrir " "el projecte" -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Desa el fitxer de projecte dins el directori base del projecte" -#: ../src/interface.c:2929 -#, fuzzy +#: ../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 " @@ -1652,77 +1652,77 @@ "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àled de Nou Projecte" +"projecte al diàleg de Nou Projecte." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projectes" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Miscel·lània" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "General" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Mostra la llista de símbols" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Activa o desactiva la llista de símbols" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Mostra la llista de documents" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Activa o desactiva la llista de documents" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Barra lateral" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Llista de símbols:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Finestra de missatges:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Especifica la font de la finestra de missatges" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Especifica la font de la llista de símbols" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Especifica la font de l'editor" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Tipus de lletra" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Mostra les pestanyes de l'editor" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Mostra el botó del tancament" -#: ../src/interface.c:3064 +#: ../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)" @@ -1730,107 +1730,111 @@ "Mostra un botó a les pestanyes per tancar fàcilment els fitxers clicant en " "ell (cal reiniciar Geany)" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Posició de noves pestanyes:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Esquerra" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Dreta" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Doble-clic amaga tots els extres addicionals" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Crida la comanda Visualitza->Mostra o Amaga Tots els Extres" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Pestanyes de l'editor" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Part superior" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Part inferior" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Barra lateral:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Ubicació de les pestanyes:" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Mostra la barra d'estat" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interfície" -#: ../src/interface.c:3222 -#, fuzzy +#: ../src/interface.c:3242 msgid "Show T_oolbar" -msgstr "Mostra la Barra d'Eines" +msgstr "Mostra la _Barra d'Eines" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" -msgstr "" +msgstr "_Annexar a la Barra d'Eines del Menú" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 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:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Barra d'eines" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Estil de les icones:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Mida de la icona:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Aparença" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "_Personalitza la Barra d'Ei_nes" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Barra d'Eines" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Ajust de línia" -#: ../src/interface.c:3349 +#: ../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 " @@ -1840,11 +1844,11 @@ "Aquesta opció és molt costosa per a document llargs, per tant convé " "desactivar-la en màquines amb pocs recursos." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Activa la tecla d'inici \"intel·ligent\"" -#: ../src/interface.c:3354 +#: ../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 " @@ -1858,11 +1862,11 @@ "la tecla INICI sempre desplaça el cursor al principi de la línia actual, " "independentment de la seva posició." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Desactiva l'Arrossega i Solta" -#: ../src/interface.c:3359 +#: ../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" @@ -1870,32 +1874,31 @@ "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:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Activa el col·lapsat" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Activa el col·lapse del codi" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Desplega o plega recursivament un punt plegat" -#: ../src/interface.c:3369 -#, fuzzy +#: ../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" +"Majúscules mentre cliqueu un símbol plegat actua de forma contrària." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Utilitza indicacions per mostrar els errors de compilació" -#: ../src/interface.c:3374 +#: ../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" @@ -1903,91 +1906,91 @@ "Usa indicadors (un subratllat ondulat) per ressaltar les línies on el " "compilador ha generat un avís o error" -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Elimina espais sobrants en introduir un salt de línia" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Columna on trenca la línia:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Marcador de comentaris:" -#: ../src/interface.c:3406 +#: ../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 "Una cadena que s'afegirà quan es canvie una línia a comentada." -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Funcionalitats" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Funcionalitats" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Mode autosagnat:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Bàsic" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Caràcters actuals" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Marca parèntesis" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Tipus:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Amplada:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "L'amplada, en caracters, de cada nivell de sagnat" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Usa espais en inserir un nivell de sagnat" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Utilitza una tabulació per al sagnat" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Amplada de cada tabulació:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -1995,52 +1998,52 @@ "Indica si s'ha de detectar el tipus de sagnat a partir del contingut del " "fitxer quan s'obre" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Sagnat amb tabulacions" -#: ../src/interface.c:3548 +#: ../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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Sagnat" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Sagnat" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Acabament de construccions" -#: ../src/interface.c:3581 +#: ../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 acaba-la a una de més complexa amb " -"una sola polsació de teclat" +"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:3583 -msgid "XML tag auto completion" -msgstr "Autoacabament d'etiquetes XML" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" +msgstr "Autocompletat d'etiquetes XML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Continuació auntomàtica dels comentaris multilínia" -#: ../src/interface.c:3591 +#: ../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" @@ -2048,104 +2051,111 @@ "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:3593 -msgid "Automatic symbol completion" -msgstr "Autoacabament de símbols" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "Autocompleta els símbols" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "" -"Autoacabament de símbols coneguts en el fitxers oberts (noms de funcions, " +"Autocompletat de símbols coneguts en el fitxers oberts (noms de funcions, " "variables globals, ...)" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "Autocompleta totes les paraules del document" + +#: ../src/interface.c:3646 +msgid "Drop rest of word on completion" +msgstr "Suprimeix la resta de la paraula al completar" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Màxim número de noms de símbols:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Mida de la llista d'autocompletat:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "Caràcters a escriure per l'acabament:" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" +msgstr "Caràcters a escriure per l'autocompletat:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"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'autoacabament de " +"Quantitat de caràcters necessaris per a mostrar la llista d'autocompletat de " "símbols" -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" -msgstr "Nombre de files mostrades en la llista d'autoacabament" +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" +msgstr "Nombre de files mostrades en la llista d'autocompletat" + +#: ../src/interface.c:3701 +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:3649 -msgid "Maximum number of entries to display in the auto completion list" -msgstr "Nombre màxim de files mostrades en la llista d'autoacabament" - -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Acabaments" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Parèntesis ()" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Tanca automàticament el parèntesi, quan se n'obre un" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Cometes senzilles ' ' " -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 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:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Claus { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Tanca automàticament les claus, quan se n'obre una" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Cluadàtors [ ]" -#: ../src/interface.c:3698 -#, fuzzy +#: ../src/interface.c:3750 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:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Cometes dobles \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 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:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Tancament automàtic de cometes i parèntesis" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Acabaments" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Inverteix els colors de la coloració de la sintaxi" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2153,44 +2163,43 @@ "Usa lletra blanca sobre fons negre i inverteix tots els colors, aquesta " "opció requereix un reinici de Geany" -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Mostra les guies de sagnat" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Mostra espais en blanc" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 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:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Mostra el final de línia" -#: ../src/interface.c:3753 -#, fuzzy +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Mostra el caràcter de final de línia (EOL)" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Mostra els números de línia" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Mostra o amaga el marge amb els Números de Línia" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Mostra el marge de marques" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2198,38 +2207,38 @@ "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:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Atura el desplaçament a l'última línia" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Visualització" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Barra de marques:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Color de la barra de marques:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Especifica els color de la barra de marques" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../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 Color" -#: ../src/interface.c:3826 +#: ../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 " @@ -2239,22 +2248,22 @@ "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:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Línia" -#: ../src/interface.c:3839 +#: ../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:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Fons" -#: ../src/interface.c:3846 +#: ../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 " @@ -2264,57 +2273,57 @@ "(veieu més avall) al color indicat més avall. (Recomanable quan s'usen fonts " "de mida proporcional)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Inhabilitada" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Barra de marques" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Visualització" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Obre documents nous des de l'intèrpret d'ordres" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Caracter de final de línia per defecte:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Fitxers nous" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Codificació per defecte (fitxers nous):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Codificació per defecte (fitxers existents):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Usa codificació de caràcters fixa en obrir fitxers" -#: ../src/interface.c:3978 +#: ../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 " @@ -2324,52 +2333,52 @@ "fitxers nous i obre els fitxers amb la codificació especificada (normalment " "no és necessari)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Codificacions" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Assegura el salt de línia al final del fitxer" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Elimina espais i tabulacions sobrants" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Reemplaça tabulacions per espais" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Reemplaça totes les tabulacions al document per espais" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Desant fitxers" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Mostra la llista de fitxers oberts:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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" -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Temps d'espera del disc:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2377,27 +2386,27 @@ "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:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Fitxers" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Explorador:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Ruta i opcions per a l'eina make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2405,23 +2414,23 @@ "Un emulador de terminal com xterm, gnome-terminal o konsole (cal que accepti " "l'argument -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Ruta (i opcions) per al navegador" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Ruta a les eines" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Acció contextual:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2432,67 +2441,67 @@ "Pot estar a qualsevol part de l'ordre donada i serà reemplaçada abans de " "l'execució." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Ordres" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Eines" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "adreça de correu electrònic del desenvolupador" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Inicials del desenvolupador" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Versió inicial:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Número de versió, per a fitxers nous" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Nom de l'empresa" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Desenvolupador:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Empresa:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Adreça de correu electrònic:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Inicials:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "El nom del desenvolupador" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Any:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Data i Hora:" -#: ../src/interface.c:4382 +#: ../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." @@ -2500,7 +2509,7 @@ "Indiqueu el format del comodí {datetime}. Podeu utilitzar qualsevol variable " "suportada per la funció ANSI C strftime." -#: ../src/interface.c:4389 +#: ../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." @@ -2508,7 +2517,7 @@ "Indiqueu el format del comodí {year}. Podeu utilitzar qualsevol variable " "suportada per la funció ANSI C strftime." -#: ../src/interface.c:4396 +#: ../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." @@ -2516,66 +2525,64 @@ "Indiqueu el format del comodí {date}. Podeu utilitzar qualsevol variable " "suportada per la funció ANSI C strftime." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Dades de plantilla" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Plantilles" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "Can_via" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Dreceres de teclat" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Tecles" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Ordre:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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)" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Usa una ordre externa per a imprimir" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Imprimeix els números de línia" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Afegeix números de línia a les pàgines impreses" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Imprimeix els números de pàgina" -#: ../src/interface.c:4518 ../src/printing.c:352 -#, fuzzy +#: ../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" +"Afegeix números de pàgina a la part de baix. Ocupa 2 línies de la pàgina." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Imprimeix la capçalera de la pàgina" -#: ../src/interface.c:4523 ../src/printing.c:357 -#, fuzzy +#: ../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." @@ -2583,20 +2590,19 @@ "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:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Usa el nom base del fitxer imprés" -#: ../src/interface.c:4543 -#, fuzzy +#: ../src/interface.c:4595 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Format de data:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2606,536 +2612,551 @@ "pàgina. Podeu utilitzar qualsevol variable suportada per la funció ANSI C " "strftime." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Usa la impressió nativa de GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Impressió" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Propietats del Projecte" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Fitxer" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nou" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Obre" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Obre el fitxer seleccionat" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Desa" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Desa com" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Desa-ho tot" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Imprimeix" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Tanca" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Tanca-ho tot" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Actualitza el fitxer" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Projecte" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Propietats del projecte" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Desfer" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Refer" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Duplica la línia i la selecció" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Suprimeix la línia(es) actual" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Desplaça la línia actual" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Desplaça cap a dalt la vista en una línia" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Desplaça cap a baix la vista en una línia" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Acaba la construcció" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Desplaça el cursor en la construcció (snippet)" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" -msgstr "Suprimeix el acabament de construccions" +msgstr "Suprimeix el completat de construccions" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Acció Contextual" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Acaba la paraula" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Mostra els prototips de funció" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Mostra la llista de macros" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Porta-retalls" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Talla" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Copia" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Enganxa" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Copia la línia(es) actual" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Talla la línia(es) actual" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Selecciona" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Selecciona-ho Tot" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Selecciona la paraula actual" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Selecciona la línia(es) actual" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Selecciona el paràgraf actual" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Canvia la Caixa de la Selecció" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Activa o desactiva els comentaris de línia" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Comenta la línia(es)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Descomenta la línia(es)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Incrementa el sagnat" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Redueix el sagnat" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Incrementa el sagnat en un espai" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Redueix el sagnat en un espai" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Sagnat de línia \"intel·ligent\"" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Envia a l'Ordre Pròpia 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Envia a l'Ordre Pròpia 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Envia a l'Ordre Pròpia 3" -#: ../src/keybindings.c:317 -#, fuzzy +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" -msgstr "_Envia la Selecció a..." +msgstr "Envia la Selecció al Terminal" + +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Insereix" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Insereix la data" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Insereix espai en blanc alternatiu" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Preferències" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Cerca" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Cerca" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Cerca el Següent" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Cerca l'Anterior" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Cerca el Següent Seleccionat" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Cerca·l'Anterior·Seleccionat" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Reemplaça" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Cerca en els Fitxers" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Missatge Següent" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Missatge Anterior" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Ús de la Cerca" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Ús de la Cerca de Documents" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "Marca-ho Tot" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Vés a" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Ves enrere" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Ves avant" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Vés al parèntesi corresponent" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Activa o desactiva les marques" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Ves a la marca següent" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Ves a la marca anterior" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Vés a la Definició de l'Etiqueta" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Vés a la Declaració de l'Etiqueta" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Vés a l'Inici de la Línia" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Vés al Final de la Línia" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "Vés al Final de la Línia" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Ves a la Part de la Paraula Anterior" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Ves a la Part de la Paraula Següent" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Visualitza" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Mostra o Amaga Tots els Extres" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Mostra o Amaga la Finestra de Missatges" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Mostra o Amaga la Barra Lateral" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Apropa" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Allunya" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Focus" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Canvia a l'Editor" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Canvia al Bloc de Notes" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Canvia a l'Emulador de Terminal" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Canvia a la Barra de Cerca" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Canvia a la Barra Lateral" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Canvia al Compilador" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Pestanya de notes" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Canvia al document de l'esquerra" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Canvia al document de la dreta" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Canvia a l'últim document utilitzat" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Canvia al document de l'esquerra" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Canvia al document de la dreta" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Canvia al primer document" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Canvia a l'últim document" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Document" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Activa o desactiva l'Ajust de línia" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Activa o desactiva el Trencament de línia" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Reemplaça espais per tabulacions" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Desplega/plega el punt actual" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Plega-ho tot" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Desplega-ho tot" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Actualitza la llista de símbols" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Munta" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Compila" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Compila-ho tot" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Compila amb make (objectiu especificat)" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Compila amb 'make object'" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Error següent" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Error anterior" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Executa" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Executa una ordre definida" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Opcions per muntar" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Mostra el Selector de Color" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Ajuda" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Dreceres de Teclat" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Les dreceres de teclat següents són configurables:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Canvia al Document" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Hi ha hagut un error en carregar un o més fitxers de sessió." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Missatges de Depuració" @@ -3183,7 +3204,7 @@ #: ../src/main.c:136 msgid "Don't load auto completion data (see documentation)" -msgstr "No carreguis les dades d'autoacabament (veieu la documentació)" +msgstr "No carreguis les dades d'autocompletat (veieu la documentació)" #: ../src/main.c:138 msgid "Don't load plugins" @@ -3194,8 +3215,8 @@ msgstr "Mostra el prefix d'instal·lació de Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "no carreguis els fitxers de l'última sessió" +msgid "Don't load the previous session's files" +msgstr "No carreguis els fitxers de l'última sessió" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3209,24 +3230,24 @@ msgid "Show version and exit" msgstr "Mostra la versió i surt" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[FITXERS...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Desplaçar ara?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3236,7 +3257,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3245,7 +3266,7 @@ "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:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3256,22 +3277,22 @@ "Pot haver problemes si useu Geany sense un directori de configuració.\n" "Voleu iniciar Geany?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "No s'ha pogut crear el directori de configuració (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "S'ha recarregat el fitxer de configuració." @@ -3287,7 +3308,7 @@ msgid "_Hide Message Window" msgstr "_Amaga la Finestra de Missatges" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3296,11 +3317,11 @@ "El plugin \"%s\" no és un binari compatible amb aquesta versió de Geany - " "l'haureu de recompilar." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "_Gestor de Connectors" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3311,23 +3332,23 @@ "Descripció:·%s\n" "Autor(s):·%s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Actiu" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Connector" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "No hi ha connectors disponibles." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Connectors" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3335,50 +3356,58 @@ "Aquesta és la llista de connectors disponibles. Selecciona els connectors " "que es carregaran a l'inici." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Detalls del connector:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Acció" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Drecera" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Captura la combinació de tecles" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "_Expandeix-ho Tot" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "_Plega-ho Tot" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Acció" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Drecera" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Sobrescriu" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Sobrescriure la drecera?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "La combinació '%s' ja s'està utilitzant per \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3386,7 +3415,7 @@ "Indiqueu la informació per a les plantilles. Veieu la documentació per a més " "detalls." -#: ../src/prefs.c:1458 +#: ../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." @@ -3397,7 +3426,7 @@ "> Recarrega Configuració." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3408,7 +3437,7 @@ "clic en una acció per editar la representació de la drecera." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3417,18 +3446,8 @@ "compilat amb suport GTK 2.10 (o superior) i Geany s'està executant " "amb GTK 2.10 (o superior)." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"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." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3436,45 +3455,54 @@ "Advertència: aquestes preferències estan sent sobreescrites pel projecte " "actual. Veieu Projecte->Propietats." -#: ../src/printing.c:270 +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "La font de l'editor no és d'amplada fixa!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "El text no serà correctament espaiat." + +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Pàgina %d de %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Configuració del Document" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Pàgina %d de %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "S'ha cancel·lat la impressió del fitxer %s." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "S'ha imprès el fitxer '%s'." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Ha fallat la impressió de %s (%s)." -#: ../src/printing.c:832 -#, fuzzy +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." -msgstr "Cal que abans especifiqueu una ordre d'impressió en Preferències" +msgstr "" +"Per favor, abans especifiqueu una ordre d'impressió al diàleg de " +"preferències." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3485,7 +3513,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Ha fallat la impressió de \"%s\" (codi de retorn: %s)." @@ -3504,19 +3532,19 @@ msgid "C_reate" msgstr "C_rea" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nom:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Nom de fitxer:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Directori base:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3526,41 +3554,41 @@ "un directori nou, o un ja existent. Podeu usar directoris relatius al fitxer " "de projecte." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Tria Directori Base del Projecte" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "No s'ha pogut carregar el fitxer de projecte \"%s\"." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Obre un Projecte" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Fitxers del projecte" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "S'ha tancat el projecte \"%s\"." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Descripció:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Munta en el directori base" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Ordre d'execució:" -#: ../src/project.c:457 +#: ../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." @@ -3568,81 +3596,81 @@ "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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Patrons de fitxer:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Voleu tancar-lo abans de procedir?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "El projecte '%s' ja està obert." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "El nom de projecte especificat és massa curt." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Heu especificat un nom de fitxer per al projecte invàlid." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Voleu crear el directori base per al projecte?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "El directori \"%s\" no existeix." -#: ../src/project.c:666 +#: ../src/project.c:670 #, 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:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "No es pot escriure el fitxer de projecte (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "S'ha creat el projecte \"%s\"." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "S'ha desat el projecte \"%s\"." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Tria Nom de Fitxer del Projecte" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Tria l'Ordre per Executar el Projecte" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "S'ha obert el projecte \"%s\"." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "_Utilitza expressions regulars" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3650,15 +3678,15 @@ "Utilitza expressions regulars tipus POSIX. Per a informació detallada sobre " "expressions regulars, llegiu la documentació." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Cerca cap e_nrere" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Usa seqüències d'_escapament" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3666,400 +3694,408 @@ "Reemplaça \\\\, \\t, \\n, \\r i \\uXXXX (caràcters Unicode) amb les " "seqüències de control corresponents" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Sensible a _majúscules" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Cerca només _paraules completes" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Cerca només el p_rincipi de la paraula" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Anterior" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Següent" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Cerca:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Cerca-ho Tot" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Marca" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Marca totes les coincidències en el document" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "A la _Sessió" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "Al _Document" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Tanca el _diàleg" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Desactiva aquesta opció i mantingues obert el diàleg" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Cerca _i Reemplaça" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Reem_plaça amb:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Reemplaça-ho _Tot" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "A la Se_lecció" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Reemplaça totes les ocurrències en el text seleccionat" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Directori:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "_Codificació:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Cadenes _fixes" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Grep amb expressions regulars" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "Veieu el manual de 'grep' per a més informació" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Utilitza expressions regulars esteses" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Opera _recursivament als subdirectoris" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Inverteix els resultats de la cerca" -#: ../src/search.c:782 -#, fuzzy +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" -"Inverteix el sentit la cerca, selecciona les línies que no contenen el text." +"Inverteix el sentit de la cerca, per a seleccionar les línies que no " +"contenen el text" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Opcions e_xtra:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Altres opcions per a Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "S'ha trobat %d coincidència de \"%s\"." msgstr[1] "S'han trobat %d coincidències de \"%s\"." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "El directori per cercar als fitxers no és vàlid." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "No hi ha text per cercar." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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." -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Cercant..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (al directori: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "No s'ha pogut obrir el directori (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "No s'han trobat coincidències." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Capítol" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Secció" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Apèndix" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Altres" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Mòdul" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Tipus" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Constructors de tipus" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Funcions" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Seccions" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Tecles" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Variables" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Ordre" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Entorn" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Subsecció" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Subsubsecció" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Etiqueta" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Estructures" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Paquet" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "El meu" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "El nostre" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfícies" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Classes" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Constants" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Àncores" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Capçalera (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Capçalera (H2)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Capçalera (H3)" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "Selectors de ID" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Selectors de Tipus" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Mòduls" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Mètodes" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Espais de noms" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Procediments" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "Importacions" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Membres" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Etiquetes" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Subrutines" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blocs" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Definicions" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Objectius" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Espais de noms" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Tipus de fitxer desconegut per a \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4068,7 +4104,7 @@ "Ús: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4079,168 +4115,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Carrega les Etiquetes" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Carregat(s) %s fitxer(s) d'etiquetes '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "No s'ha pogut carregar el fitxer d'etiquetes '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "No s'ha trobat la declaració de \"%s\"." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "No s'ha trobat la definició de \"%s\"." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "_Expandeix-ho Tot" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "_Plega-ho Tot" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Ordena per _Nom" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Ordena per _Aparença" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Desa el fitxer" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Desa-ho Tot" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Desa tots els fitxers oberts" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Actualitza el fitxer des del disc" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Tanca el fitxer" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Tanca tots els fitxers oberts" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Talla el text de la selecció actual" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Copia el text de la selecció actual" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Enganxa el contingut del portaretalls" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Esborra el text de la selecció actual" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Desfés l'ultima modificació" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Refés l'última modificació" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Compila el fitxer" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Executa o visualitza el fitxer" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Amplia" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Redueix" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Redueix el sagnat" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Incrementa el sagnat" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Cerca el text al fitxer" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Vés al número de línia introduït" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Mostra el diàleg de preferències" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Surt de Geany" -#: ../src/toolbar.c:75 -#, fuzzy +#: ../src/toolbar.c:79 msgid "Print document" -msgstr "Document XML" +msgstr "Imprimeix el document" -#: ../src/toolbar.c:153 -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." +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "Reemplaça el text en el document actual" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Crea un nou fitxer" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Obre un fitxer existent" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Vés a" +#: ../src/toolbar.c:533 +msgid "Separator" +msgstr "Separador" + +#: ../src/toolbar.c:534 +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:913 +msgid "Available Items" +msgstr "Elements Disponibles" + +#: ../src/toolbar.c:934 +msgid "Displayed Items" +msgstr "Elements Mostrats" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4308,123 +4354,143 @@ msgid "Characters:" msgstr "Caràcters:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "No s'han trobat etiquetes" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Mostra la Llista de _Símbols" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Mostra la Llista de _Documents" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Amaga la Barra _Lateral" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "Mostra les _Rutes" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "línia: %d\t col: %d\t sel: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "LEC " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "SOB" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "mode: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "codificació: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "tipus de fitxer: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "objectiu: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Font actualitzada (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Llibreria Estàndard de C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Llibreria Estàndard de C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Llibreria Estàndard de C++" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "STL de C++" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Especifica el Format de Data Propi" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Selecciona Directori" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Selecciona Fitxer" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Fitxer de C_onfiguració" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Desa-ho Tot" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Tanca-ho Tot" +#: ../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 "Terminal" @@ -4592,161 +4658,145 @@ "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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Fitxers de projecte de Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Executables" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Error" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Pregunta" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Advertència" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Informació" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Constructor de Classes" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Crea fitxers font per als nous tipus de classes." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Crea Classe" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Classe" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Nom de la classe:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Fitxer de capçalera:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Codi font:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Herència" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Classe base:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Capçalera base:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "GType base:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Opcions" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Crea constructor" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Crea destructor" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Tipus de constructor GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Crea Cla_sse" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "Classe _C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "Classe _GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caràcters HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Insereix les entitats HTML com '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "L'equip de desenvolupament de Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Caràcters HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Caràcters ISO-8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Caràcters grecs" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Caràcters matemàtics" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Caràcters tècnics" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Caràcters de fletxa" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Símbols de puntuació" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Caràcters diversos" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Caràcters especials" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Insereix" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4754,160 +4804,155 @@ "Tria un caràcter especial de la llista i fes doble clic per inserir-lo a la " "posició actual del cursor." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Caràcter" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (nom)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_Insereix Caràcter Especial HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 -#, fuzzy +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" -msgstr "Posició de pestanyes" +msgstr "Reemplaç d'HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 -#, fuzzy +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" -msgstr "Posició de noves pestanyes:" +msgstr "Reemplaçament en massa de caràcters especials" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Insereix Caràcters Especials HTML" -#: ../plugins/htmlchars.c:733 -#, fuzzy +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" -msgstr "Caràcters especials" +msgstr "Reemplaça els caràcters especials" -#: ../plugins/htmlchars.c:736 -#, fuzzy +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" -msgstr "Activa o desactiva els comentaris de línia" +msgstr "Activa o desactiva el plugin d'estat" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Exporta" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exporta el fitxer actual en diferents formats." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Exporta un Fitxer" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Usa el nivell de zoom actual" -#: ../plugins/export.c:193 -#, fuzzy +#: ../plugins/export.c:185 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 de zoom." +msgstr "Ajusta la mida de la font del document al nivell del zoom" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "El document ha estat exportat amb èxit com a '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "No es pot escriure el fitxer '%s' (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Exporta" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Com a _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Com a _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Explorador de Fitxers" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 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:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Massa elements seleccionats!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, 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:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Obre _externament" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Cerca en els Fitxers" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Mostra els Fitxers _Ocults" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Dalt" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Actualitza" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Inici" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Especifica el directori pel document" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Neteja el filtre" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filtre:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Enfoca la Llista de Fitxers" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Enfoca el Quadre de la Ruta" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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." @@ -4946,8 +4991,8 @@ "inclou *.o, *.obj. *.so, *.dll, *.a, *.lib" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" -msgstr "Especificva el directori base per al projecte" +msgid "Use the project's base directory" +msgstr "Usa el directori base del projecte" #: ../plugins/filebrowser.c:1132 msgid "" @@ -4956,33 +5001,33 @@ "Canvia el directori al directori base del projecte del projecte obert " "actualment" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Desa les Accions" -#: ../plugins/saveactions.c:47 +#: ../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." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "No s'ha pogut crear el Directori de Còpia de Seguretat (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "No s'ha pogut llegir el Directori de Còpia de Seguretat (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "No s'ha pogut desar el Directori de Còpia de Seguretat (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4990,108 +5035,135 @@ msgstr[1] "Autodesa: S'han desat %d fitxers automàticament." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Selecciona el Directori" -#: ../plugins/saveactions.c:471 +#: ../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." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Auto Desa" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Activa" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Interval d'auto desat:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" -msgstr "%segons" +msgstr "segons" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "_Mostra un missatge d'estat si els fitxers s'han desat automàticament" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Desa només el _fitxer obert actual" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Desa _tots els fitxers oberts" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Desat Instantani" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "Tipus de _fitxer per defecte per a fitxers de nova creació:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Còpia de Seguretat" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Directori on desar les còpies de seguretat:" -#: ../plugins/saveactions.c:686 +#: ../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\"):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Nive_lls de directori per incloure al destí de la còpia de seguretat:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Divideix la Finestra" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Divideix la vista de l'editor en dues finestres." -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Mostra el document actual" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Unifica la Finestra" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Divideix la Finestra" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Horitzontalment" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Verticalment" -#: ../plugins/splitwindow.c:422 -#, fuzzy +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" -msgstr "_Horitzontalment" +msgstr "Divideix Horitzontalment" -#: ../plugins/splitwindow.c:424 -#, fuzzy +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" -msgstr "_Verticalment" +msgstr "Divideix Verticalment" -#: ../plugins/splitwindow.c:426 -#, fuzzy +#: ../plugins/splitwindow.c:431 msgid "Unsplit" -msgstr "_Unifica la Finestra" +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." +#~ msgstr "" +#~ "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 "" @@ -5358,9 +5430,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Estructures / Definicions de tipus" -#~ msgid "Show _Full Path Name" -#~ msgstr "Mostra la _Ruta Completa" - #~ msgid "Terminal emulation:" #~ msgstr "Emulació de terminal:" @@ -5560,10 +5629,6 @@ #~ msgid "Complete construct" #~ msgstr "Crea constructor" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Suprimeix el completat de construccions" - #~ msgid "Go to tag definition" #~ msgstr "Vés a la definició de l'etiqueta" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/ChangeLog /tmp/ssBwSf4GIv/geany-0.18/po/ChangeLog --- geany-0.17/po/ChangeLog 2009-05-02 18:47:42.000000000 +0100 +++ geany-0.18/po/ChangeLog 2009-08-16 17:18:28.000000000 +0100 @@ -1,3 +1,153 @@ +2009-08-16 Enrico Tröger + + * de.po: + Several improvements of the German translation by + Dominic Hopf, thanks. + * *.po, geany.pot: + Regenerate message catalog template. + Remove a fuzzy mark from all translations. + + +2009-08-13 Frank Lanitz + + * fi.po: Update of Finnish translation. Thanks to Jari Rahkonen and + Harri Koskinen. + + +2009-08-13 Frank Lanitz + + * ca.po: Update of Catalan translation (Thanks to Toni Garcia-Navarro) + + +2009-08-12 Frank Lanitz + + * pt_PT.po, LINGUAS: + Added a first Portugese (Portugal) translation based on work done at + launchpad by e.g. André Glória and Alexandre Jesus. + + +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. + + +2009-08-08 Frank Lanitz + + * de.po: Update of German translation. + + +2009-08-07 Frank Lanitz + + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + +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. + + +2009-08-05 Frank Lanitz + + * cs.po: Update of Czech translation. Thanks to Karel Kolman for + providing. + * ja.po: Update of Japanese translation. Thanks to Chikahiro Masami. + + +2009-08-04 Frank Lanitz + + * pt_BR.po: Update of Brasilian Portuguese translation + (Thanks to Adrovane Marques Kade). + + +2009-08-03 Frank Lanitz + + * en_GB.po: Update British English translation (Thanks to Jeff Bailes) + + +2009-08-02 Frank Lanitz + + * sl_SI.po: Update of Slovenian translation. Thanks to Joze Klepec. + * sl.po: Rename Slovenian translation file. + + +2009-08-01 Frank Lanitz + + * *.po: Update for upcoming string freeze of Geany 0.18 + + +2009-07-27 Frank Lanitz + + * sl_SI.po: Update of Slovenian translation. Thanks to Joze Klepec. + + +2009-07-25 Frank Lanitz + + * sl_SI.po: Added a first Slovenian translation. + Thanks to Joze Klepec. + + +2009-07-24 Frank Lanitz + + * de.po: Minor update of German translation. + + +2009-07-13 Frank Lanitz + + * ru.po: Update of Russian translation. Thanks to John Wehin. + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + + 2009-07-07 Frank Lanitz + + * tr.po: Update of Turkish translation. Thanks to Gürkan Gür. + + +2009-06-27 Frank Lanitz + + * fr.po: Update of French translation. Thanks to Lionel Fuentes for + providing. + + +2009-06-01 Frank Lanitz + + * lb.po: Update of Luxembourgian translation. Thanks to Laurent Hoeltgen. + + +2009-05-28 Frank Lanitz + + * lb.po, LINGUAS: + Added Luxembourgian translation. Huge thanks to Laurent Hoeltgen. + + +2009-05-26 Frank Lanitz + + * de.po: Minor improvement of German translation. + + +2009-05-25 Frank Lanitz + + * ru.po: Update of Russian translation. Thanks to John Wehin. + + +2009-05-12 Frank Lanitz + + * fi.po: Update of Finnish translation. Thanks to Jari Rahkonen. + + +2009-05-11 Frank Lanitz + + * de.po: Minor improvement of German translation. Thanks to Franz + Buchinger for pointing it out. + * ru.po: Fix of a typo at Russian translation. Closes 2790001. + + +2009-05-04 Frank Lanitz + + * it.po: Update of Italian translation (Thanks M. Baldinelli). + + 2009-05-02 Enrico Tröger * New release: Geany 0.17 "Wessex". diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/cs.po /tmp/ssBwSf4GIv/geany-0.18/po/cs.po --- geany-0.17/po/cs.po 2009-04-26 20:17:08.000000000 +0100 +++ geany-0.18/po/cs.po 2009-08-16 17:18:28.000000000 +0100 @@ -7,9 +7,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2009-05-26 19:05+0100\n" "Last-Translator: Karel Kolman \n" "Language-Team: Czech \n" @@ -42,67 +42,67 @@ msgid "Integrated Development Environment" msgstr "Integrované vývojové prostředí" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "O Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Rychlé a lehké IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Informace" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Vývojáři" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "správce" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "vývojář" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "správce překladu" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Překladatelé" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Předchozí překladatelé" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Přispěvatelé" -#: ../src/about.c:340 +#: ../src/about.c:342 #, 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Autoři" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licence" -#: ../src/about.c:389 +#: ../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." @@ -110,7 +110,7 @@ "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:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -119,129 +119,129 @@ "Nebyl nalezen terminál \"%s\" (zkontrolujte cestu k terminálu zadanou v " "Nastavení)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Proces selhal (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (v adresáři: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Selhala změna pracovního adresáře na \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Překlad selhal." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Překlad skončil úspěšně." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Přeložit" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Make _vlastní cíl" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make _objekt" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Další chyba" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "_Předchozí chyba" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "Nastavit _Include a argumenty" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_Zobrazit soubor DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "Zobraz_it PDF soubor" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Nastavit argumenty" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Nastavit argumenty" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Tvorba DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Tvorba PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Náhled DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Náhled PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -250,68 +250,68 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Nastavení Include a argumentů" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Nastavte příkazy pro sestavení a spouštění programů." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "Příkazy pro %s" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Přeložit:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Sestavit:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Spustit" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Sestavit aktuální soubor" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make vlastní cíl" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Zadejte zde vlastní volby, všechen zadaný text bude předán příkazu make." -#: ../src/build.c:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Přeložit aktuální soubor nástrojem Make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Selhalo spuštění zobrazovacího programu." -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Proces nemohl být přerušen (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Žádné další chyby sestavení." @@ -319,8 +319,8 @@ msgid "Do you really want to quit?" msgstr "Opravdu chcete ukončit program?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "Znovu načíst soubo_r" @@ -333,52 +333,52 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Opravdu chcete znovu načíst '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Přejít na řádek" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Zadejte číslo řádku, na který chcete jít:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.rrrr" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.rrrr" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "rrrr/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.rrrr hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.rrrr hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "rrrr/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Použít vlastní formát data" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Vlastní formát data" -#: ../src/callbacks.c:1495 +#: ../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." @@ -386,24 +386,24 @@ "Zadejte vlastní formát data a času. Můžete použít stejné konverzní " "specifikátory jako v ANSI C funkci strftime." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Žádné další zprávy." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Otevřít soubor" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "Zo_brazit" -#: ../src/dialogs.c:150 +#: ../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." @@ -411,28 +411,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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Zjistit podle přípony souboru" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Zjistit podle souboru" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "_Další volby" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Zobrazovat _skryté soubory" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Nastavit kódování:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -444,11 +444,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:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Typ souboru:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -459,25 +459,33 @@ "Pokud otevřete více souborů, všechny budou otevřeny se zvoleným typem " "souboru." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Přepsat?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Soubor s tímto jménem již existuje!" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Uložit soubor" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "_Přejmenovat" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 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:429 +#: ../src/dialogs.c:442 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:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -485,24 +493,41 @@ "Ponechat aktuální neuložený dokument otevřený a otevřít nově uložený v nové " "záložce" -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Chyba" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Otázka" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Varování" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informace" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Neukládat" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Soubor '%s' není uložen." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Chcete ho před zavřením uložit?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Vybrat písmo" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -510,106 +535,106 @@ "Nastala chyba nebo informace o souboru nemohla být získána (např. z " "prázdného souboru)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "neznámý" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Vlastnosti" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Typ:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Velikost:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Umístění:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Jen pro čtení:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(pouze pro Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Kódování:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(s BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(bez BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Upraveno:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Změněno:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Poslední přístup:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Oprávnění:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Číst" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Zapisovat" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Vlastník:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Skupina:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Ostatní:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Soubor %s uzavřen." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Nový soubor \"%s\" otevřen." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Soubor %s nemohl být otevřen (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -625,12 +650,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Soubor \"%s\" není platné %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -639,48 +664,51 @@ "Soubor \"%s\" nevypadá jako textový soubor nebo není podporováno jeho " "kódování." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Mezery" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabelátory" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Nastavuji mód odsazování %s pro %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Neplatný název souboru" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Soubor %s znovu načten." -#: ../src/document.c:1354 +#. 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 "Otevřen soubor %s (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", jen pro čtení" -#: ../src/document.c:1561 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Chyba při přejmenování souboru." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -688,7 +716,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:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -697,41 +725,41 @@ "Chybové hlášení: %s\n" "Objevila se chyba v \"%s\" (řádek: %d, sloupec: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Chybová zpráva: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Chyba při ukládání souboru." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Chyba při ukládání souboru (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Soubor %s uložen." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" nebyl nalezen." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Rozšířit hledání na celý dokument a hledat znovu?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Nebyly nalezeny žádné výskyty \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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\"." @@ -739,11 +767,11 @@ msgstr[1] "%s: nahrazeny %d výskyty \"%s\" za \"%s\"." msgstr[2] "%s: nahrazeno %d výskytů \"%s\" za \"%s\"." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Chcete ho znovu načíst?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -752,32 +780,20 @@ "Soubor '%s' na disku je novější než\n" "aktuální otevřený." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Pokusit se soubor znovu uložit ?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Soubor \"%s\" nebyl nalezen!" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Zadejte šířku tabelátoru" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Zadejte kolik znaků mezery nahradit znakem tabelátoru" @@ -878,134 +894,124 @@ msgstr "Čínské tradiční" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japonské" -#: ../src/encodings.c:141 ../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 "Korejské" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Bez kódování" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Západoevropské" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Východoevropské" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Východo_asijské" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_JV a JZ Asie" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Střední Východ" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Žádné" - # 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:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s zdrojový soubor" -#: ../src/filetypes.c:348 +# 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 +#, c-format +msgid "%s file" +msgstr "%s soubor" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Žádné" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Shell skript" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML dokument" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Kaskádové styly" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL soubor" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff soubor" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Konfigurační soubor" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext jazykový soubor" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s skript" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStrukturovanýTextový soubor" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "_Programovací Jazyky" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "_Skriptovací Jazyky" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "_Značkovací Jazyky" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "_Různé jazyky" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Všechny soubory se zdrojovým kódem" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Všechny soubory" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Špatný regulární výraz pro souborový typ %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "bezejmenný" @@ -1019,8 +1025,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "neviditelný" @@ -1028,7 +1034,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Otevřít označený _soubor" @@ -1048,11 +1054,11 @@ msgid "Page Set_up" msgstr "Nastavení Strán_ky" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Zavřít os_tatní soubory" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Zavří_t vše" @@ -1060,83 +1066,79 @@ msgid "_Edit" msgstr "_Upravit" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Vybrat _vše" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Transformovat" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Změnit _velikost písmen ve výběru" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Zakomentovat řádek" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "_Odkomentovat řádek" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Invertovat za_komentování" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Odsad_it" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Z_rušit odsazení" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "Poslat výběr do _terminálu" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "Po_slat výběr do" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Vložit _komentáře" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Vložit záznam _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Vložit _hlavičku souboru" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Vložit popis _funkce" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Vložit víceřádkový ko_mentář" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Vložit poznámku o _GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Vložit poznámku o _BSD licenci" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Vložit d_atum" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Vložit \"_include <...>\"" @@ -1160,7 +1162,7 @@ msgid "Find in F_iles" msgstr "Najít v _souborech" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Nahradit" @@ -1180,7 +1182,7 @@ msgid "Pr_evious Message" msgstr "_Předchozí zpráva" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Jít na _řádek..." @@ -1202,13 +1204,13 @@ #: ../src/interface.c:724 msgid "Show _Toolbar" -msgstr "_Lišta nástrojů" +msgstr "_Panel nástrojů" #: ../src/interface.c:729 msgid "Show Side_bar" msgstr "Po_stranní panel" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Okno editoru" @@ -1252,16 +1254,16 @@ msgid "In_dent Type" msgstr "Typ O_dsazení" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 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:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Mezery" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_abelátory a mezery" @@ -1381,7 +1383,7 @@ msgid "_Debug Messages" msgstr "_Debug zprávy" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Symboly" @@ -1406,75 +1408,80 @@ msgstr "Poznámky" # Zkontrolovat! Má být "Images" opravdu "Ikony" a ne "Obrázky"?! -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../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:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Pouze _ikony" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Pouze _text" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "_Velké ikony" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "_Malé ikony" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../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:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "_Přizpůsobit panel nástrojů" + +# Původní nepřesný překlad zněl "nástrojová lišta". "toolbar" je "panel nástrojů". +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" msgstr "_Skrýt panel nástrojů" # Další možnost překladu "usage" je "používání". -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Najít po_užití" # Další možnost překladu "usage" je "používání". -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Najít použití v _dokumentu" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Přejít na definici _tagu" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Přejít na deklaraci t_agu" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Konte_xtová akce" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Nastavení" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Načíst soubory z posledního sezení" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 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:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Načíst podporu virtuálního terminálu" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1482,39 +1489,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:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Zapnout podporu pluginů" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Při spuštění" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Uložit pozici a rozměry okna" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Potvrzovat ukončení" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Zobrazí potvrzovací okno při ukončení" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Při ukončení" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Výchozí cesta:" -#: ../src/interface.c:2758 +#: ../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." @@ -1522,50 +1529,50 @@ "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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Projektové soubory:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Výchozí cesta při otevírání souborů projektu" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Extra cesta pro pluginy:" -#: ../src/interface.c:2808 +#: ../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 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." +"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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Cesty" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Při spuštění" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Pípnout při chybě nebo při dokončení kompilace" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 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:2853 +#: ../src/interface.c:2873 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:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1573,11 +1580,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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Potlačit stavové zprávy ve stavovém řádku" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1585,29 +1592,29 @@ "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:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Automaticky zaostřit panely (ohnisko sleduje myš)" -#: ../src/interface.c:2866 +#: ../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 "" "Automaticky dává ohnisko panelům pod kurzorem myši. Je funkční pro hlavní " -"editor, poznámkový blok, pole \"hledání\" a \"jdi na řádek\" v liště " +"editor, poznámkový blok, pole \"hledání\" a \"jdi na řádek\" v panelu " "nástrojů a ve VTE." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Různé" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 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:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1615,11 +1622,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:2893 +#: ../src/interface.c:2913 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:2896 +#: ../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" @@ -1627,20 +1634,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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Hledání" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Používat soubory v sezení dle projektu" # Překlad "session" je i spojení, relace. -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1648,11 +1655,11 @@ "Zda ukládat soubory projektového sezení a otevřít je, když je projekt znovu " "otevřen." -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Projektový soubor ukládat v kořenovém adresáři projektu" -#: ../src/interface.c:2929 +#: ../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 " @@ -1663,75 +1670,75 @@ "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:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projekty" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Různé" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Hlavní" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Zobrazovat seznam symbolů" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Zapne nebo vypne zobrazování seznamu symbolů" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Zobrazovat seznam otevřených souborů" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Zapne nebo vypne zobrazování seznamu souborů" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Postranní panel" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Seznam symbolů:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Okno zpráv:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Nastavení písma pro okno zpráv" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Nastavení písma pro seznam symbolů" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Nastavení písma editoru" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Písma" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Zobrazovat záložky editoru" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Zobrazovat zavírací tlačítka" -#: ../src/interface.c:3064 +#: ../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)" @@ -1739,105 +1746,110 @@ "Zobrazuje křížky v záložkách souborů pro jednoduché zavření kliknutím " "(restart Geany nutný)" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Umístění nových záložek souborů:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Vlevo" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Vpravo" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Dvojklikem skrýt všechny ostatní panely" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Volá funkci menu Zobrazit->Skrýt/zobrazit všechny ostatní panely" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Záložky editoru" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Nahoře" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Dole" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Postranní panel:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Umístění záložek" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Zobrazovat stavový řádek" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Rozhraní" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" -msgstr "Zobrazovat lištu _nástrojů" +msgstr "Zobrazovat panel _nástrojů" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" -msgstr "_Připojit nástrojovou lištu k menu" +msgstr "_Připojit panel nástrojů k menu" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "Připojit nástrojovou lištu k hlavnímu menu pro ušetření vertikálního místa" +msgstr "" +"Připojit panel nástrojů k hlavnímu menu pro ušetření vertikálního místa" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" -msgstr "Nástrojový panel" +msgstr "Panel nástrojů" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Styl ikon:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Velikost ikon:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Vzhled" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "Přizpůsobení panelu nástrojů" + +#: ../src/interface.c:3363 msgid "Toolbar" -msgstr "Nástrojová lišta" +msgstr "Panel nástrojů" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Zalamování řádků" -#: ../src/interface.c:3349 +#: ../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 " @@ -1847,11 +1859,11 @@ "zalamování řádků v dlouhých souborech je pomalé a mělo by být vypnuto na " "slabším hardwaru." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Zapnout \"chytrou\" klávesu home" -#: ../src/interface.c:3354 +#: ../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 " @@ -1864,11 +1876,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:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Vypnout Drag and Drop" -#: ../src/interface.c:3359 +#: ../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" @@ -1876,19 +1888,19 @@ "Úplné vypnutí drag and drop v okně editoru, takže nebude možné přesunovat " "označený text myší." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Povolit skládání bloků kódu" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Zda povolit skládání bloků kódu" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 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:3369 +#: ../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." @@ -1896,11 +1908,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:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Používat indikátory k zobrazení chyb při kompilaci" -#: ../src/interface.c:3374 +#: ../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" @@ -1908,24 +1920,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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Nová řádka odstraní mezery na konci řádku" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Rozdělovat řádky delší než:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Označení přepínacího komentáře:" -#: ../src/interface.c:3406 +#: ../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." @@ -1933,95 +1945,95 @@ "Ř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:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Vlastnosti" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Vlastnosti" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Mód automatického odsazování:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Základní" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Současné znaky" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Přejít na odpovídající závorku" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Šířka:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "Šířka jednoho odsazení ve znacích" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Používat mezery při vkládání odsazení" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Používat jeden tabelátor na jedno odsazení" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" "Používat mezery pokud je celkové odsazení menší než šířka tabelátoru, jinak " "používat kombinaci obojí" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Šířka tabelátoru:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 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:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Klávesa tabelátor odsazuje" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Odsazování" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Odsazování" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Doplňování kousků kódu" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2029,20 +2041,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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" msgstr "Autokompletace XML značek" # completion=doplňování? -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Automatické pokračování víceřádkových komentářů" -#: ../src/interface.c:3591 +#: ../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" @@ -2050,11 +2062,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:3593 -msgid "Automatic symbol completion" -msgstr "Automatické doplňování symbolů" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "Autokompletace symbolů" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2062,89 +2074,97 @@ "Automatické doplňování známých symbolů v otevřených souborech (názvy funkcí, " "globální proměnné, ...)" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "Autokompletace všech slov v dokumentu" + +#: ../src/interface.c:3646 +msgid "Drop rest of word on completion" +msgstr "Po kompletaci zahodit zbytek slova" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Maximální počet navržených symbolů" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Výška seznamu doplňování:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "Počet znaků pro doplňování" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" +msgstr "Počet napsaných znaků pro doplňování" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"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:3640 -msgid "Display height in rows for the auto completion list" -msgstr "Počet řádků v seznamu automatické kompletace." +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" +msgstr "Počet viditelných řádků v seznamu automatické kompletace." -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Automatické doplňování" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Závorky ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automaticky zavírat závorku po napsání levé" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Jednoduché uvozovky ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "Automaticky zavírat jednoduchou uvozovku po napsání levé" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Složené závorky { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 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:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Hranaté závorky [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "Automaticky zavírat hranatou závorku po napsání levé" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Dvojité uvozovky \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "Automaticky zavírat dvojitou uvozovku po napsání levé" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Automatické zavírání uvozovek a závorek" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Doplňování" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Invertovat barvy pro zvýraznění syntaxe" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2152,44 +2172,44 @@ "Používat bílý text na černém pozadí a invertovat všechny barvy, tato volba " "vyžaduje restart programu Geany" -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Zobrazovat odsazení" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Zobrazovat bílé znaky" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Označí mezery tečkami a tabelátory šipkami." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Zobrazovat konce řádků" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Zobrazí znak konce řádku" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Zobrazovat čísla _řádků" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Zobrazení nebo skrytí okraje s čísly řádků" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Zobrazovat označovací okraj" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2197,36 +2217,36 @@ "Zobrazení nebo skrytí malého okraje vpravo od čísel řádků, který se používá " "k označování řádků" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Zastavit rolování na posledním řádku" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Zobrazení" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Označení pravého okraje:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Barva označení pravého okraje:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Nastaví barvu pravého okraje" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Výběr barvy" -#: ../src/interface.c:3826 +#: ../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 " @@ -2236,21 +2256,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:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Čára" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 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:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Pozadí" -#: ../src/interface.c:3846 +#: ../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 " @@ -2259,57 +2279,57 @@ "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:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Vypnuto" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Pravý okraj" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Zobrazení" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Otevřít nové dokumenty z příkazové řádky" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Výchozí znaky ukončení řádku:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Nové soubory" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Výchozí kódování (nových souborů):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Výchozí kódování (existujících souborů):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Použít pevně nastavené kódování při otevírání souborů" -#: ../src/interface.c:3978 +#: ../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 " @@ -2318,51 +2338,51 @@ "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:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Kódování:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Vkládat nový řádek na konec souboru" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Odstranit mezery a tabelátory na konci řádků" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Odstraní mezery a tabelátory na konci řádků" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Nahrazovat tabelátory mezerami" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Nahradí všechny tabelátory v dokumentu mezerami" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Ukládání souborů" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Délka seznamu nedávných souborů:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Interval kontroly změn souborů na disku" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2370,27 +2390,27 @@ "Jak často kontrolovat změny souborů na disku, v sekundách. Nulová hodnota " "vypne kontrolování." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Soubory" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminál:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Webový prohlížeč:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Cesta a volby pro nástroj make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2398,23 +2418,23 @@ "Emulátor terminálu, jako např. xterm, gnome-terminal nebo konsole (měl by " "přijímat argument -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 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:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Cesty k nástrojům" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Kontextová akce:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2424,67 +2444,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:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Příkazy" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Nástroje" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "Emailová adresa vývojáře" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Iniciály jména vývojáře" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Výchozí verze:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Číslo verze, které bude mít zpočátku nový soubor" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Název společnosti" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Jméno:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Společnost:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Emailová adresa:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Iniciály:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Jméno vývojáře" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Rok:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Datum a čas" -#: ../src/interface.c:4382 +#: ../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." @@ -2492,7 +2512,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:4389 +#: ../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." @@ -2500,7 +2520,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:4396 +#: ../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." @@ -2508,85 +2528,85 @@ "Zadejte formát pro {date} symbol šablony. Můžete použít stejné konverzní " "specifikátory jako v ANSI C funkci strftime." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Umístění šablon" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Šablony" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "_Změnit" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Klávesové zkratky" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Přiřazení kláves" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Příkaz:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 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:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Tisknout čísla řádků" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 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:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Tisknout čísla stránek" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "" "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:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Tisknout hlavičku stránky" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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 "" -"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." +"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:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Pouze jméno tisknutého souboru" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Formát data:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2595,540 +2615,556 @@ "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:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Používat nativní tisk GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Tisk" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Vlastnosti projektu" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Soubor" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nový" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Otevřít" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Otevřít zvolený soubor" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Uložit" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Uložit jako" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Uložit vše" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Vytisknout" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Zavřít" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Zavřít vše" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Znovu načíst soubor" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Vlastnosti projektu" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Zpět" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Znovu" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Zduplikovat řádek nebo výběr" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Vymazat aktuální řádek (řádky)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Přejít k aktuálnímu řádku" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Rolovat nahoru o jeden řádek" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Rolovat dolů o jeden řádek" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Doplnit kousek kódu" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Přesunout kurzor dovnitř kousku kódu" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Zakázat kompletaci kousku kódu" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Kontextová akce" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Dokončit slovo" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Zobrazit calltip" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Zobrazit seznam maker" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Schránka" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Vyjmout" # Původní nepřesný překlad: "Společnost:". -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Kopírovat" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Vložit" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Zkopírovat aktuální řádek (řádky)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Vyjmout aktuální řádek (řádky)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Vybrat" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Vybrat vše" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Vybrat aktuální slovo" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Vybrat aktuální řádek (řádky)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Vybrat aktuální odstavec" # Původní nepřesný překlad zněl "_Transformovat". -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Formát" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Změnit výšku písmen ve vybraném textu" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Přepínací řádkový komentář" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Zakomentovat řádek" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Odkomentovat řádek" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Odsadit" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Zrušit odsazení" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Odsadit o jednu mezeru" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Zmenšit odsazení o jednu mezeru" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Chytré odsazení" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Použít Vlastní příkaz 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Použít Vlastní příkaz 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Použít Vlastní příkaz 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" -msgstr "Po_slat výběr do terminálu" +msgstr "Poslat výběr do terminálu" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "Přeformátovat řádky/blok" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Vložit" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Vložit datum" -#: ../src/keybindings.c:325 +#: ../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:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Nastavení" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Hledat" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Najít" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Najít další" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Najít předchozí" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Najít další výběr" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Najít předchozí výběr" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Nahradit" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Najít v souborech" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Další zpráva" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Předchozí zpráva" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Najít použití" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Najít použití v dokumentu" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "Označit všechny výskyty" + +#: ../src/keybindings.c:369 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:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 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:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Navigovat na adresu vpřed" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Přejít na odpovídající závorku" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Označit řádek" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Přejít na další značku" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Přejít na předchozí značku" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Přejít na definici" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Přejít na deklaraci" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Přejít na začátek řádku" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Přejít na konec řádku" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "Přejít na konec zobrazené části řádku" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Přejít na předchozí část slova" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Přejít na další část slova" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Zobrazit" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Skrýt/zobrazit všechny ostatní panely" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Celá obrazovka" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Zobrazit/skrýt okno zpráv" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Zobrazit/skrýt postranní panel" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Zvětšit" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Zmenšit" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Fokus" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Přepnout do editoru" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Přepnout na Poznámky" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Přepnout do terminálu" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Přepnout na Vyhledávání" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Přepnout na postranní panel" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Přepnout na překladač" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Záložky dokumentů" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Přejít do levého dokumentu" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Přejít do pravého dokumentu" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Přejít do předchozího dokumentu" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Posunout dokument doleva" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Posunout dokument doprava" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Posunout dokument na začátek" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Posunout dokument na konec" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Přepnout zalamování řádků" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Přepnout rozdělování dlouhých řádků" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Nahradit mezery tabelátory" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Sbalit/rozbalit aktuální blok" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Složit vše" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Rozložit vše" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Obnovit seznam symbolů" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Sestavit" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Přeložit" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Make vlastní cíl" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make objekt" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Další chyba" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Předchozí chyba" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Spustit" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Spustit (alternativní příkaz)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Volby sestavení" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Zobrazit Výběr barev" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Nápověda" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Klávesové zkratky" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Následující klávesové zkratky jsou konfigurovatelné:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Přepnout na dokument" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Chyba při otevírání jednoho či více souborů sezení." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Debug zprávy" @@ -3185,8 +3221,8 @@ msgstr "Vypsat prefix Geany instalace" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "neotevírat soubory z posledního sezení" +msgid "Don't load the previous session's files" +msgstr "Neotevírat soubory z posledního sezení" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3200,24 +3236,24 @@ msgid "Show version and exit" msgstr "Vypsat číslo verze a ukončit" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[SOUBORY...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Přesunout nyní ?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3226,7 +3262,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3235,7 +3271,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:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3246,22 +3282,22 @@ "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:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "Soubor \"%s\" nebyl nalezen." -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Vítejte v Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurační adresář nemohl být vytvořen (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Konfigurační soubory přenačteny." @@ -3277,7 +3313,7 @@ msgid "_Hide Message Window" msgstr "_Skrýt okno zpráv" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3286,11 +3322,11 @@ "Plugin \"%s\" není binárně kompatibilní s touto verzí Geany - překompilujte " "jej, prosím." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "_Správce pluginů" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3301,23 +3337,23 @@ "Popis: %s\n" "Autoři: %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Aktivní" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Žádné pluginy k dispozici." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Pluginy" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3325,50 +3361,58 @@ "Zde je seznam dostupných pluginů. Zvolte pluginy, které mají být načteny při " "startu Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Detaily o pluginu" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Akce" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Zkratka" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Zadání klávesové zkratky" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "_Rozbalit vše" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "_Sbalit vše" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Akce" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Zkratka" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Přepsat" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Přepsat tuto klávesovou zkratku ?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Kombinace '%s' je již použita pro \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3376,7 +3420,7 @@ "Zadejte údaje, které chcete použít v šablonách.\n" "Pro detaily viz dokumentaci." -#: ../src/prefs.c:1458 +#: ../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." @@ -3387,7 +3431,7 @@ "konfiguraci." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3398,7 +3442,7 @@ "textové reprezentace zkratky." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3407,17 +3451,8 @@ "sestaven s knihovnou GTK 2.10 (nebo vyšší verzí) a Geany zároveň běží " "s GTK 2.10 (nebo vyšší verzí)." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"Upozornění: Pro upravení lišty nástrojů editujte soubor 'ui_toolbar.xml'. " -"Detaily naleznete v dokumentaci." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3425,47 +3460,55 @@ "Varování: tato nastavení jsou aktuálním projektem přenastavena. Viz menu " "Projekt->Vlastnosti." +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "Font editoru nemá pevnou šířku znaku!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "Text bude nekorektně rozhozen." + # Původní nepřesný překlad byl "Změněno:". -#: ../src/printing.c:270 +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Stránka %d z %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Nastavení dokumentu" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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:491 +#: ../src/printing.c:526 #, 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:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Tisk souboru %s byl ukončen." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Soubor %s byl vytištěn." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Tisk souboru %s selhal (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 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:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3476,7 +3519,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Tisk souboru \"%s\" selhal (návratový kód: %s)." @@ -3495,19 +3538,19 @@ msgid "C_reate" msgstr "_Vytvořit" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Název:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Soubor projektu:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Základní cesta:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3517,41 +3560,41 @@ "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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Zvolte základní cestu projektu" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Soubor projektu \"%s\" nemohl být načten." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Otevřít projekt" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Soubory projektu" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt \"%s\" zavřen." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Popis:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Sestavit v základní cestě" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Příkaz pro spuštění:" -#: ../src/project.c:457 +#: ../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." @@ -3559,81 +3602,81 @@ "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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Vzor souborů:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Chcete ho před pokračováním zavřít?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Projekt '%s' je již otevřen." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Zadaný název projektu je příliš krátký." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Zadali jste neplatný název souboru projektu." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Vytvořit adresář projektu?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Cesta \"%s\" neexistuje." -#: ../src/project.c:666 +#: ../src/project.c:670 #, 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:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Soubor projektu nemohl být zapsán (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Projekt \"%s\" vytvořen." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt \"%s\" uložen." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Zvolte soubor projektu" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../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:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt \"%s\" otevřen." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Použít _regulární výrazy" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3641,15 +3684,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:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Hledat zpě_tně" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Použít _escape sekvence" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3657,126 +3700,126 @@ "Nahradit \\\\, \\t, \\n, \\r a \\uXXXX (Unicode znaky) odpovídajícími " "kontrolními znaky." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Rozlišovat _velikost písmen" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Hledat pouze _celé slovo" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Hledat od _začátku slova" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Předchozí" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Následující" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Hledat:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Najít vše" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "Oz_načit" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Označit všechny výskyty v aktuálním dokumentu." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "Ve všech _otevřených souborech" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "V _dokumentu" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Z_avřít okno" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 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:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Nahra_dit a najít" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Nahradit z_a:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Nahra_dit vše" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "_Ve výběru" -#: ../src/search.c:592 +#: ../src/search.c:607 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:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Adresář:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "_Kódování:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "_Jednoduché řetězce" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Regulární výrazy _grepu" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "Pro více informací viz manuál programu grep." -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "Rozšířené _regulární výrazy" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "_Rekurzivně v podadresářích" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Obrátit výsledky hledání" -#: ../src/search.c:782 +#: ../src/search.c:797 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:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "_Dodatečné volby:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Další volby grepu" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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\"." @@ -3784,7 +3827,7 @@ msgstr[1] "Nalezeny %d výskyty \"%s\"." msgstr[2] "Nalezeno %d výskytů \"%s\"." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, c-format msgid "Replaced text in %u file." msgid_plural "Replaced text in %u files." @@ -3792,39 +3835,39 @@ msgstr[1] "Text nahrazen v %u souborech." msgstr[2] "Text nahrazen v %u souborech." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Neplatný adresář pro hledání souborů." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Žádný text k prohledání." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Hledám..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (v adresáři: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Adresář nemohl být otevřen (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -3832,230 +3875,238 @@ 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Žádné výskyty nebyly nalezeny." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Kapitola" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Sekce" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Appendix" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Ostatní" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Moduly" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Typy" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Konstruktory typů" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Funkce" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Sekce" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Klíče" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Proměnné" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Příkaz" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Prostředí" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Podsekce" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Podpodsekce" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Label" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Struktury" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Balíček" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "My" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Our" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Rozhraní" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Třídy" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Konstanty" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "H1 hlavičky" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "H2 hlavičky" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "H3 hlavičky" # CSS -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "ID selektory" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Typové selektory" # Ruby -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Moduly" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletony" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Metody" +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Namespaces" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Procedury" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "Importy" + # Java atd. -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "" # Basic, ASM -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Návěští" # Fortran -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Podrutiny" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Bloky" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Makra" # ASM -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "" # Makefiles -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Cíle" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Namespaces" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Struktury" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Neznámý tep souboru pro příponu \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4064,7 +4115,7 @@ "Použití: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4075,168 +4126,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Načíst tagy" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Načten soubor %s tagů '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Nemohl být načten soubor tagů \"%s\"." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Deklarace \"%s\" nebyla nalezena." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definice \"%s\" nebyla nalezena." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "_Rozbalit vše" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "_Sbalit vše" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Setřídit podle _názvu" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Setřídit podle _pořadí v souboru" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Uložit aktuální soubor" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Uložit vš_e" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Uložit všechny otevřené soubory" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Znovu načíst aktuální soubor z disku" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Zavřít aktuální soubor" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Zavřít všechny otevřené soubory" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Vyjmout označený text" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Kopírovat označený text" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Vložit obsah schránky" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Vymazat označený text" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Vrátí zpět poslední akci" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Provede znovu vrácenou akci" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Přeloží (zkompiluje) aktuální soubor" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Spustit nebo zobrazit aktuální soubor" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Zvětšit text" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Zmenšit text" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Zmenšit odsazení" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Zvětšit odsazení" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Hledat zadaný řetězec v aktuálním souboru" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Přejít na zadané číslo řádku" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Zobrazit okno nastavení" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Ukončí Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Tisknout dokument" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" -"Pro nabytí platnosti zde provedených změn bude potřeba restartovat Geany." +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "Nahradit text v aktuálním dokumentu." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Vytvořit nový soubor" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Otevřít existující soubor" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Přejít na" +#: ../src/toolbar.c:533 +msgid "Separator" +msgstr "Oddělovač" + +#: ../src/toolbar.c:534 +msgid "--- Separator ---" +msgstr "--- Oddělovač ---" + +#: ../src/toolbar.c:897 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Vyberte položky k zobrazení v panelu nástrojů. Položky mohou být seřazeny " +"přetahováním." + +#: ../src/toolbar.c:913 +msgid "Available Items" +msgstr "Položky k dispozici" + +#: ../src/toolbar.c:934 +msgid "Displayed Items" +msgstr "Zobrazené položky" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4304,125 +4365,145 @@ msgid "Characters:" msgstr "Znaky:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Nenalezeny žádné tagy" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 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:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Zobrazovat s_eznam dokumentů" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "S_krýt postranní panel" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "Zobrazovat _cesty" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "PŘE" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "VLO" # indentation TAB = tabulators, SP = spaces -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "MEZ" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/M" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "mód: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "kódování: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "typ souboru: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "ZMĚ" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "rámec: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Písmo aktualizováno (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C Standard Library" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Library)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ Standard Library" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Nastavit vlastní formát data" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Vybrat složku" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Vybrat soubor" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "K_onfigurační soubory" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Uložit vš_e" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Zavřít vše" +#: ../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 "Terminál" @@ -4587,161 +4668,145 @@ "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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geany soubor projektu" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Spustitelné" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Chyba" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Otázka" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Varování" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Informace" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Tvořič tříd" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Vytváří zdrojové soubory pro nové třídy." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Vytvořit třídu" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Třída" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Název třídy:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Hlavičkový soubor:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Zdrojový soubor:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Dědičnost" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Základní třída:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Základní hlavička:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Globální" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Základní GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Volby" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Vytvořit konstruktor" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Vytvořit destruktor" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+ typ konstruktoru" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "_Vytvořit třídu" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "_C++ třída" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "_GTK+ třída" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML znaky" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Vkládat HTML znakové entity jako '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Tým vývojářů Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML znaky" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 znaky" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Řecké znaky" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Matematické symboly" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Technické symboly" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Šipky" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Interpunkce" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Různé znaky" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Speciální znaky" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "Vlož_it" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4749,155 +4814,156 @@ "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:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Znak" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (entita)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Vložit _speciální HTML znak" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "HTML nahrazení" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "_Zapnuto" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Nahradit speciální znaky" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Vložit speciální HTML znaky" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Nahradit speciální znaky" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Přepnout stav pluginu" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Export" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exportuje aktuální soubor do různých formátů." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Exportovat soubor" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Použít současné zvětšení" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" -msgstr "Nastaví velikost písma exportovaného dokumentu podle současné úrovně zvětšení" +msgstr "" +"Nastaví velikost písma exportovaného dokumentu podle současné úrovně zvětšení" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokument byl úspěšně exportován jako '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Soubor '%s' nemohl být zapsán (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Export" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Jako _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Jako _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Prohlížeč souborů" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 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:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Vybráno příliš mnoho položek !" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, 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:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Otevřít _externě" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Najít v souborech" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Zobrazovat _skryté soubory" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "O úroveň výš" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Obnovit" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Domovská složka" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Adresář otevřeného dokumentu" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Vymazat filtr" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filtr:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Fokus seznamu souborů" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Fokus řádku s cestou" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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." @@ -4936,7 +5002,7 @@ "příponami *.o, *.obj. *.so, *.dll, *.a, *.lib" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "Následovat kořenový adresář projektu" #: ../plugins/filebrowser.c:1132 @@ -4944,31 +5010,31 @@ "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" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Ukládání souborů" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "Plugin poskytuje různé operace týkající se ukládání souborů" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Záložní kopie: adresář nemohl být vytvořen (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Záložní kopie: Soubor nemohl být přečten (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Záložní kopie: soubor nemohl být uložen (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4977,104 +5043,133 @@ msgstr[2] "Autoukládání: %d souborů bylo automaticky uloženo." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Vybrat adresář" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Adresář pro záložní kopie neexistuje nebo není zapisovatelný." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Automatické ukládání" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Povolit" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Interval autoukládání" # Podívat se, zdali "seconds" nejsou překládány jako "vteřiny", aby to bylo jednotné! -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "sekundy" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "_Zobrazovat stavovou zprávu o proběhlém automatickém uložení souborů" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Ukládat pouze _aktuální otevřený soubor" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Ukládat _všechny otevřené soubory" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Okamžité uložení" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "T_yp nově vytvářených souborů:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Záložní kopie" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Adresář pro ukládání záložních kopií:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "Formát _data/času záložních kopií (\"man strftime\" pro podrobnosti):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "_Počet adresářových úrovní vytvářených v adresáři zálohy:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Rozdělení okna" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Rozdělí okno editoru na dvě části" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Zobrazit aktuální dokument" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Zrušit rozdělení" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Rozdělení okna" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Horizontálně" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Vertikálně" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Rozdělit horizontálně" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Rozdělit vertikálně" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "Zrušit rozdělení" +#~ msgid "Diff file" +#~ msgstr "Diff soubor" + +#~ msgid "reStructuredText file" +#~ msgstr "reStrukturovanýTextový soubor" + +#~ msgid "Select _All" +#~ msgstr "Vybrat _vše" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Automatické doplňování symbolů" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "Upozornění: Pro upravení lišty nástrojů editujte soubor 'ui_toolbar." +#~ "xml'. Detaily naleznete v dokumentaci." + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "Pro nabytí platnosti zde provedených změn bude potřeba restartovat Geany." + #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Selhalo zobrazení %s (ujistěte se, že soubor byl již přeložen)" @@ -5527,10 +5622,6 @@ #~ msgid "Complete construct" #~ msgstr "Vytvořit konstruktor" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Zakázat kompletaci konstrukce" - #~ msgid "Go to tag definition" #~ msgstr "Přejít na definici" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/de.po /tmp/ssBwSf4GIv/geany-0.18/po/de.po --- geany-0.17/po/de.po 2009-04-28 22:18:23.000000000 +0100 +++ geany-0.18/po/de.po 2009-08-16 17:18:28.000000000 +0100 @@ -3,17 +3,17 @@ # This file is distributed under the same license as the geany package. # Enrico Tröger 2006 - 2009 # Frank Lanitz 2006 - 2009 -# Dominic Hopf 2008 +# Dominic Hopf 2008 - 2009 # # Basic guidelines for this translation: http://i18n.xfce.org/wiki/team_de # msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" -"PO-Revision-Date: 2009-04-28 23:15+0100\n" -"Last-Translator: Frank Lanitz \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" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -27,9 +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:262 ../src/interface.c:1476 msgid "Geany" msgstr "Geany" @@ -37,282 +35,282 @@ msgid "Integrated Development Environment" msgstr "Integrierte Entwicklungsumgebung" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Über Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Info" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Entwickler" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "Entwickler" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Übersetzer" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Ehemalige Übersetzer" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Mitwirkende" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format -msgid "Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine detailliertere Liste findet sich in der Datei %s):" +msgid "" +"Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "" +"Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " +"detailliertere Liste findet sich in der Datei %s):" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Credits" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Lizenz" -#: ../src/about.c:389 -msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." -msgstr "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/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 "" +"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:219 -#: ../src/build.c:769 +#: ../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 "Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" +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:234 -#: ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 -#: ../src/build.c:552 -#: ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Konnte nicht in das Arbeitsverzeichnis »%s« wechseln" -#: ../src/build.c:731 -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:707 +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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Kompilierung fehlgeschlagen." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Kompilierung erfolgreich beendet." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Kompilieren" #. build the code -#: ../src/build.c:1060 -#: ../src/build.c:2130 -#: ../src/interface.c:976 +#: ../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:1072 -#: ../src/build.c:1178 -#: ../src/build.c:2141 +#: ../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:1081 -#: ../src/build.c:1187 -#: ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" #. build the code with make object -#: ../src/build.c:1090 -#: ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make _Objekt-Datei" #. next error -#: ../src/build.c:1103 -#: ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Nächster _Fehler" -#: ../src/build.c:1110 -#: ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "_Vorheriger Fehler" #. arguments -#: ../src/build.c:1135 -#: ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "_Include-Parameter und Argumente angeben" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_DVI-Datei anzeigen" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "_PDF-Datei anzeigen" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Programm-Parameter angeben" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Programmparameter angeben" -#: ../src/build.c:1326 +#: ../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." +msgstr "" +"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)" +"TeX-Dateien." -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "DVI-Erstellung:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "PDF-Erstellung:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "DVI-Vorschau:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "PDF-Vorschau:" -#: ../src/build.c:1414 -#: ../src/build.c:1596 +#: ../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" +"%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Include-Parameter und Argumente angeben" -#: ../src/build.c:1506 +#: ../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." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "Kommandos für %s" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Kompilieren:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Erstellen:" -#: ../src/build.c:1573 -#: ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Ausführen:" -#: ../src/build.c:1901 -#: ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Kompiliert die aktuelle Datei" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make (eigenes Target)" -#: ../src/build.c:1927 -msgid "Enter custom options here, all entered text is passed to the make command." +#: ../src/build.c:1918 +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." -#: ../src/build.c:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Kompiliert die aktuelle Datei mit make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Konnte das Programm zum Anzeigen nicht ausführen." -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:2101 -#: ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." @@ -320,10 +318,8 @@ msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:469 -#: ../src/document.c:2898 -#: ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Neu laden" @@ -336,348 +332,393 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1246 -#: ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1341 -#: ../src/callbacks.c:1366 -msgid "Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +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:1471 -#: ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1473 -#: ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1475 -#: ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1477 -#: ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" -msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" +msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1479 -#: ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" -msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" +msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1481 -#: ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" -msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" +msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1483 -#: ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1495 -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 "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." +#: ../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 "" +"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " +"können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " +"»strftime« zum Einsatz kommen können." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." -msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "" +"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: ../src/callbacks.c:1770 -#: ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Keine weiteren Nachrichten." #. initialize the dialog -#: ../src/dialogs.c:143 -#: ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:147 -#: ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Ansicht" -#: ../src/dialogs.c:150 -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 "Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien zum Öffnen wählen, werden alle schreibgeschützt geöffnet." +#: ../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 "" +"Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien zum Öffnen " +"wählen, werden alle schreibgeschützt geöffnet." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Durch Dateiendung erkennen" -#: ../src/dialogs.c:197 -#: ../src/interface.c:3538 -#: ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Aus Datei lesen" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "_Weitere Optionen" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "_Versteckte Dateien anzeigen" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Zeichenkodierung festlegen:" -#: ../src/dialogs.c:287 +#: ../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." +"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 "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " +"automatisch erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der " +"gewählten Zeichenkodierung geöffnet." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Dateityp festlegen:" -#: ../src/dialogs.c:304 +#: ../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." +"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 "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " +"Dateiendung erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem " +"gewählten Dateityp geöffnet." + +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Überschreiben?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Der Dateiname existiert bereits!" -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Datei speichern" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "_Umbenennen" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Speichert und benennt die Datei um" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" -msgstr "_Datei in einem neuen Tab öffnen" +msgstr "_Datei in einem neuen Reiter öffnen" + +#: ../src/dialogs.c:444 +msgid "" +"Keep the current unsaved document open and open the newly saved file in a " +"new tab" +msgstr "" +"Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem " +"neuen Reiter." + +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Fehler" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Frage" -#: ../src/dialogs.c:431 -msgid "Keep the current unsaved document open and open the newly saved file in a new tab" -msgstr "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem neuen Tab" +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Warnung" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Information" -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Nicht speichern" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "»%s« wurde nicht gespeichert." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Möchten Sie vor dem Schließen speichern?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Schriftart auswählen" -#: ../src/dialogs.c:971 -msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." -msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." - -#: ../src/dialogs.c:990 -#: ../src/dialogs.c:991 -#: ../src/dialogs.c:992 -#: ../src/dialogs.c:998 -#: ../src/dialogs.c:999 -#: ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 -#: ../src/symbols.c:1685 -#: ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../src/dialogs.c:1005 +msgid "" +"An error occurred or file information could not be retrieved (e.g. from a " +"new file)." +msgstr "" +"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 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1005 -#: ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Eigenschaften" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Dateityp:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Größe:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Ort:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Kodierung:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 -#: ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(mit BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(ohne BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Modifiziert:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Geändert:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Zugriff:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Zugriffsrechte:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Lesen:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Schreiben:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Gruppe:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Andere:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Datei »%s« wurde geschlossen." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:964 -#: ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." -#: ../src/document.c:994 +#: ../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 \"%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 "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« enthält und kann zu Datenverlust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell " +"abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« " +"enthält und kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei »%s« ist kein gültiges %s." -#: ../src/document.c:1030 +#: ../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 "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung wird nicht unterstützt." +msgid "" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung " +"wird nicht unterstützt." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für »%s«." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Datei »%s« neu geladen." -#: ../src/document.c:1354 +#. 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 "Datei »%s« geöffnet (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1561 +#: ../src/document.c:1512 msgid "Error renaming file." -msgstr "Fehler beim Umbenennen von Datei" +msgstr "Fehler beim Umbenennen der Datei." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format -msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." -msgstr "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert." +msgid "" +"An error occurred while converting the file from UTF-8 in \"%s\". The file " +"remains unsaved." +msgstr "" +"Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " +"Die Datei wird nicht gespeichert." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -686,102 +727,84 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1763 -#: ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:1913 -#: ../src/document.c:1970 -#: ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2057 -#: ../src/search.c:1065 -#: ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2068 -#: ../src/document.c:2077 +#: ../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: %d mal wurde »%s« mit »%s« ersetzt." msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete Version." +msgstr "" +"Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " +"Version." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:3852 -#: ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 -#: ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 -#: ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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." +msgstr "" +"Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " +"werden sollen." #: ../src/encodings.c:76 msgid "Celtic" msgstr "Keltisch" -#: ../src/encodings.c:77 -#: ../src/encodings.c:78 +#: ../src/encodings.c:77 ../src/encodings.c:78 msgid "Greek" msgstr "Griechisch" @@ -793,31 +816,22 @@ msgid "South European" msgstr "Südeuropäisch" -#: ../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 "Westlich" -#: ../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 "Baltisch" -#: ../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 "Mitteleuropäisch" #. 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 "Kyrillisch" @@ -833,16 +847,12 @@ msgid "Romanian" msgstr "Rumänisch" -#: ../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 "Arabisch" #. 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 "Hebräisch" @@ -856,207 +866,153 @@ #: ../src/encodings.c:112 msgid "Georgian" -msgstr "Georgian" +msgstr "Georgisch" #: ../src/encodings.c:113 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 "Türkisch" -#: ../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 "Vietnamesisch" -#: ../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 "Chinesisch, vereinfacht" -#: ../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 "Chinesisch, traditionell" -#: ../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 "Japanisch" -#: ../src/encodings.c:141 -#: ../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 "Koreanisch" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Ohne Zeichenkodierung" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Westeuropäisch" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Osteuropäisch" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Ost_asiatisch" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_SO- & SW-Asiatisch" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Nahöstlich" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 -#: ../src/filetypes.c:91 -#: ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Keiner" - -#: ../src/filetypes.c:102 -#: ../src/filetypes.c:113 -#: ../src/filetypes.c:125 -#: ../src/filetypes.c:136 -#: ../src/filetypes.c:147 -#: ../src/filetypes.c:158 -#: ../src/filetypes.c:169 -#: ../src/filetypes.c:181 -#: ../src/filetypes.c:192 -#: ../src/filetypes.c:203 -#: ../src/filetypes.c:214 -#: ../src/filetypes.c:225 -#: ../src/filetypes.c:236 -#: ../src/filetypes.c:247 -#: ../src/filetypes.c:259 -#: ../src/filetypes.c:271 -#: ../src/filetypes.c:282 -#: ../src/filetypes.c:293 -#: ../src/filetypes.c:304 -#: ../src/filetypes.c:315 -#: ../src/filetypes.c:326 -#: ../src/filetypes.c:337 -#: ../src/filetypes.c:384 -#: ../src/filetypes.c:395 -#: ../src/filetypes.c:429 -#: ../src/filetypes.c:440 -#: ../src/filetypes.c:485 -#: ../src/filetypes.c:496 -#: ../src/filetypes.c:530 -#: ../src/filetypes.c:541 -#: ../src/filetypes.c:552 -#: ../src/filetypes.c:563 -#: ../src/filetypes.c:574 +#: ../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 "%s Quelldatei" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "%s Quelldatei" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Keiner" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Shellskript Datei" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML-Dokument" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff Daten" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Konfigurationsdatei" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext-Übersetzungsdatei" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s Skript Datei" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reST Quelldatei" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:1284 -#: ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Alle Quellen" -#: ../src/filetypes.c:1309 -#: ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "unbenannt" @@ -1068,16 +1024,10 @@ 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:2006 -#: ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../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" @@ -1085,8 +1035,7 @@ msgid "dummy tooltip, don't translate this." msgstr "dummy" -#: ../src/interface.c:311 -#: ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" @@ -1106,13 +1055,11 @@ msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:393 -#: ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:401 -#: ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "_Alle schließen" @@ -1120,103 +1067,79 @@ msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/interface.c:459 -#: ../src/interface.c:1919 -msgid "Select _All" -msgstr "A_lles auswählen" - -#: ../src/interface.c:468 -#: ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:475 -#: ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:484 -#: ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: ../src/interface.c:488 -#: ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: ../src/interface.c:492 -#: ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: ../src/interface.c:496 -#: ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" -msgstr "_Zeile oder Auswahl kopieren" +msgstr "_Zeile oder Auswahl duplizieren" -#: ../src/interface.c:505 -#: ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: ../src/interface.c:513 -#: ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:526 -#: ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../src/interface.c:530 -#: ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Auswahl senden an" -#: ../src/interface.c:545 -#: ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:556 -#: ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:560 -#: ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:564 -#: ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:568 -#: ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:572 -#: ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:576 -#: ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:580 -#: ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:594 -#: ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" @@ -1240,8 +1163,7 @@ msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:644 -#: ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Ersetzen" @@ -1261,8 +1183,7 @@ msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:683 -#: ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "_Gehe zu Zeile" @@ -1290,9 +1211,7 @@ msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:734 -#: ../src/interface.c:3865 -#: ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1336,21 +1255,15 @@ msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:808 -#: ../src/interface.c:3496 -#: ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:814 -#: ../src/interface.c:3487 -#: ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Leerzeichen" -#: ../src/interface.c:820 -#: ../src/interface.c:3505 -#: ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" @@ -1454,8 +1367,7 @@ msgid "_Reload Configuration" msgstr "_Einstellungen erneut laden" -#: ../src/interface.c:1011 -#: ../src/interface.c:1018 +#: ../src/interface.c:1011 ../src/interface.c:1018 msgid "_Help" msgstr "_Hilfe" @@ -1471,8 +1383,7 @@ msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1073 -#: ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Symbole" @@ -1496,1620 +1407,1814 @@ msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:1725 -#: ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Symbole _und Text" -#: ../src/interface.c:1731 -#: ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Nur _Symbole" -#: ../src/interface.c:1737 -#: ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Nur _Text" -#: ../src/interface.c:1748 -#: ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "_Große Symbole" -#: ../src/interface.c:1754 -#: ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "_Kleine Symbole" -#: ../src/interface.c:1760 -#: ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "_Sehr kleine Symbole" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" -msgstr "Werkzeugliste _verbergen" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "_Werkzeugleiste anpassen" + +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" +msgstr "Werkzeugleiste _verbergen" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Gehe zur T_agdeklaration" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2647 -#: ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2690 -msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" -msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option deaktiviert werden." +#: ../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 "" +"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden " +"soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option " +"deaktiviert werden." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Starten" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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." +msgstr "" +"Speichert die Fensterposition und die Fenstergröße und stellt sie beim " +"nächsten Start wieder her." -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Beenden " -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:2758 -msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." -msgstr "Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen Sie das Feld leer." +#: ../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 "" +"Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad " +"muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen " +"Sie das Feld leer." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Zusätzlicher Pluginpfad" -#: ../src/interface.c:2808 -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 prüft im Standard das Installationsverzeichnis sowie das Konfigurationsverzeichnis. Ein Pfad, der hier eingegeben wird, wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird ignoriert, falls es leer ist." +#: ../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 schaut standardmäßig im Installationsverzeichnis und im " +"Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, " +"wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird " +"ignoriert, falls es leer ist." -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Pfade" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Starten & Beenden" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:2851 -msgid "Whether to beep if an error occurred or when the compilation process has finished" -msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll" +#: ../src/interface.c:2871 +msgid "" +"Whether to beep if an error occurred or when the compilation process has " +"finished" +msgstr "" +"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " +"ausgegeben werden soll" -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" -msgstr "Bei neuen Meldungen zum Statusmeldungsfenster wechseln" +msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" -#: ../src/interface.c:2856 -msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" -msgstr "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, wenn eine neue Statusmeldung vorliegt" +#: ../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 "" +"Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, " +"wenn eine neue Statusmeldung vorliegt" -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Statusmeldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:2861 -msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." -msgstr "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind weiterhin über den »Status«-Reiter im Infobereich abrufbar." +#: ../src/interface.c:2881 +msgid "" +"Removes all messages from the status bar. The messages are still displayed " +"in the status messages window." +msgstr "" +"Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " +"weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:2866 -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 "Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der Werkzeugliste sowie für das integrierte Terminal." +#: ../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 "" +"Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem " +"sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für " +"das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " +"Werkzeugliste sowie für das integrierte Terminal." -#: ../src/interface.c:2868 -#: ../src/interface.c:3194 -#: ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:2891 -msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" -msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen" +#: ../src/interface.c:2911 +msgid "" +"Always wrap search around the document and hide the Find dialog after " +"clicking Find Next/Previous" +msgstr "" +"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " +"Klicken auf Nächstes/Vorheriges schließen" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" -#: ../src/interface.c:2896 -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:2916 +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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Suche" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:2924 -msgid "Whether to store a project's session files and open them when re-opening the project" -msgstr "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:2944 +msgid "" +"Whether to store a project's session files and open them when re-opening the " +"project" +msgstr "" +"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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" -#: ../src/interface.c:2929 -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 "Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." +#: ../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 "" +"Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts " +"die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts " +"angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " +"angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projekte" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Symbolliste anzeigen" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Blendet die Symbolliste ein und aus" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Blendet die Dokumentenliste ein und aus" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Seitenleiste" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3001 -#: ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3008 -#: ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbolliste fest" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Schriftarten" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" -msgstr "Zeige Karteireiter für geöffnete Dateien" +msgstr "Zeige Dateireiter für geöffnete Dateien" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "»Schließen«-Schaltflächen anzeigen" -#: ../src/interface.c:3064 -msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" -msgstr "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:3084 +msgid "" +"Shows a small cross button in the file tabs to easily close files when " +"clicking on it (requires restart of Geany)" +msgstr "" +"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:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" -msgstr "Platzierung neuer Dateien:" +msgstr "Platzierung neuer Dateireiter:" -#: ../src/interface.c:3075 -#: ../src/interface.c:3129 -#: ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Links" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" -msgstr "Neue Dateien werden links von der Dateiliste platziert" +msgstr "Neue Dateireiter werden links von der Dateiliste platziert" -#: ../src/interface.c:3083 -#: ../src/interface.c:3130 -#: ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" -msgstr "Neue Dateien werden rechts von der Dateiliste platziert" +msgstr "Neue Dateireiter werden rechts von der Dateiliste platziert" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" -msgstr "Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur das Editorfenster an" +msgstr "" +"Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor " +"an" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Dateireiter" -#: ../src/interface.c:3131 -#: ../src/interface.c:3149 -#: ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3132 -#: ../src/interface.c:3150 -#: ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Reiterposition" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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" +msgstr "" +"Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " +"werden soll oder nicht" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Werkzeugleiste _anzeigen" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "_Werkzeugliste direkt an das Menü anfügen" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "Fügt die Werkzeugliste direkt hinter dem Hauptmenü an um etwas vertikalen Platz zu sparen. " +msgstr "" +"Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen " +"Platz zu sparen." -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Symbolstil:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Symbolgröße:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Aussehen" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "Werkzeugleiste anpassen" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Visueller Zeilenumbruch" -#: ../src/interface.c:3349 -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 "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +#: ../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 "" +"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " +"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " +"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home) aktivieren" -#: ../src/interface.c:3354 -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 "Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle Position Rücksicht zu nehmen." +#: ../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 "" +"Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor " +"bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort " +"befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert " +"ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle " +"Position Rücksicht zu nehmen." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../src/interface.c:3359 -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 "Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass markierter Text mit der Maus verschoben werden kann." +#: ../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 "" +"Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass " +"markierter Text mit der Maus verschoben werden kann." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Quelltext-Ausblendung aktivieren" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Legt fest, ob es möglich sein soll, Teile des Quelltextes auszublenden" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" -#: ../src/interface.c:3369 -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 "Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das Symbol geklickt wird." +#: ../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 "" +"Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei " +"gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das " +"Symbol geklickt wird." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen" -#: ../src/interface.c:3374 -msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" -msgstr "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +#: ../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 "" +"Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " +"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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" +msgstr "" +"Legt fest, ob unnötige Leerzeichen am Ende einer Zeile automatisch beim " +"Wechseln in eine neue Zeile entfernt werden sollen" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Spalte für automatischen Zeilenumbruch:" -#: ../src/interface.c:3399 +# TODO woah, hier muss noch was anderes her :D +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Kommentarumschaltzeichen:" -#: ../src/interface.c:3406 -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 "Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet werden kann." +#: ../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 "" +"Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den " +"Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet " +"werden kann." -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3445 -#: ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3458 -#: ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3459 -#: ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3460 -#: ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3462 -#: ../src/interface.c:3805 -#: ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3469 -#: ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Breite:" -#: ../src/interface.c:3482 -#: ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "Die Breite einer Einrückung in Zeichen" -#: ../src/interface.c:3492 -#: ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3501 -#: ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../src/interface.c:3510 -#: ../src/interface.c:5058 -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:3554 ../src/interface.c:5122 +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:3525 -#: ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Tabulatorenbreite:" -#: ../src/interface.c:3533 -#: ../src/interface.c:5081 +#: ../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" +msgstr "" +"Die Breite eines Tabulators, wenn »Tabulatoren & Leerzeichen« für das " +"Dokument ausgewählt ist" -#: ../src/interface.c:3543 -#: ../src/interface.c:5091 -msgid "Whether to detect the indentation type from file contents when a file is opened" -msgstr "Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung (Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu bestimmen" +#: ../src/interface.c:3587 ../src/interface.c:5155 +msgid "" +"Whether to detect the indentation type from file contents when a file is " +"opened" +msgstr "" +"Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung " +"(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " +"bestimmen" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Einrücken mit der Tabulatortaste" -#: ../src/interface.c:3548 -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:3592 +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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3555 -#: ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3581 -msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" -msgstr "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem komplexeren Text erweitert werden" +#: ../src/interface.c:3625 +msgid "" +"Type a defined short character sequence and complete it to a more complex " +"string using a single keypress" +msgstr "" +"Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " +"komplexeren Text erweitert werden" -#: ../src/interface.c:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" msgstr "XML-Tag Autovervollständigung" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" -#: ../src/interface.c:3591 -msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" -msgstr "Verlängert den Kommentarbereich in den Sprachen C, C++ und Java, wenn eine neue Zeile innerhalb eines Kommentares hinzu gefügt wird" - -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "Automatische Vervollständigung von Symbolen" - -#: ../src/interface.c:3596 -msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" -msgstr "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen geöffneter Dateien" +#: ../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 "" +"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 +msgid "Autocomplete symbols" +msgstr "Autovervollständigung von Symbolen" + +#: ../src/interface.c:3640 +msgid "" +"Automatic completion of known symbols in open files (function names, global " +"variables, ...)" +msgstr "" +"Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " +"aus den geöffneten Dateien" + +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "Autovervollständigung aller Wörter im Dokument" + +#: ../src/interface.c:3646 +msgid "Drop rest of word on completion" +msgstr "Bei Vervollständigung den Rest des Wortes ersetzen." -#: ../src/interface.c:3604 +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Max. Vorschläge der Symbolvervollständigung:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Höhe der Vervollständigungsliste:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:3631 -msgid "The amount of characters which are necessary to show the symbol auto completion list" -msgstr "Die Anzahl der Zeichen, die nötig sind um die Vervollständigungsliste anzuzeigen" - -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" -msgstr "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die Vervollständigungsliste angezeigt wird" +#: ../src/interface.c:3683 +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 +msgid "Display height in rows for the autocompletion list" +msgstr "Höhe der Liste in Zeilen" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" -msgstr "Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Vervollständigungsliste angezeigt wird" +#: ../src/interface.c:3701 +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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Klammern ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Einfache Anführungs-/Schlusszeichen" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" -msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" +msgstr "" +"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " +"öffnenden" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Geschweifte Klammern {}" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Eckige Klammern [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" -msgstr "Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden Klammer" +msgstr "" +"Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden " +"Klammer" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Doppelte Anführungs-/Schlusszeichen" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" -msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" +msgstr "" +"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " +"öffnenden" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Automatisches Schließen von Klammern und Anführungszeichen" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntaxhervorhebungen" -#: ../src/interface.c:3738 -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." +#: ../src/interface.c:3790 +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." -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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" +msgstr "" +"Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen" -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Zeige Zeilenenden" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" -msgstr "Zeilenendezeichen anzeigen" +msgstr "Macht Zeilenenden mit einem Sonderzeichen sichtbar" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" -msgstr "Zeigt oder versteckt den Zeilennummernrand" +msgstr "Zeigt oder versteckt den Rand mit den Zeilennummern" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Markierungsrand anzeigen" -#: ../src/interface.c:3763 -msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" -msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher zum Anzeigen von Markierungen genutzt wird" +#: ../src/interface.c:3815 +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines" +msgstr "" +"Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher " +"zum Anzeigen von Markierungen genutzt wird" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Am Ende des Dokuments nicht mehr weiter rollen" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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" +msgstr "" +"Legt fest, ob am Ende des Dokuments noch eine Seite weiter nach unten " +"gerollt werden kann oder nicht" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Anzeige" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Zeilenlänge markieren bei:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Farbe der Markierung:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der »Umbruchhilfe für lange Zeilen« ein" -#: ../src/interface.c:3818 -#: ../src/toolbar.c:66 -#: ../src/tools.c:746 -#: ../src/vte.c:769 -#: ../src/vte.c:776 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 +#: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Farbwähler" -#: ../src/interface.c:3826 -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 "Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." +#: ../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 "" +"Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im Editor. " +"Sie hilft dabei, lange Zeilen zu finden und weist dabei auf einen eventuell " +"notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in " +"der die Linie angezeigt werden soll." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Linie" -#: ../src/interface.c:3839 -msgid "Prints a vertical line in the editor window at the given cursor position (see below)" -msgstr "Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-Position (nur sinnvoll mit Festbreitenschriften)" +#: ../src/interface.c:3891 +msgid "" +"Prints a vertical line in the editor window at the given cursor position " +"(see below)" +msgstr "" +"Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position " +"(nur sinnvoll mit dicktengleichen Schriften)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Hintergrund" -#: ../src/interface.c:3846 -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 "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position (siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich für proportionale Schriftarten)" +#: ../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 "" +"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position " +"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich " +"für proportionale Schriftarten)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Deaktiviert" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Umbruchhilfe für lange Zeilen" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Ansicht" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Öffne neue Dokumente von der Kommandozeile" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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" +msgstr "" +"Öffnet eine neue Datei für jeden Dateinamen, der auf der Kommandozeile " +"angegeben wurde aber nicht geöffnet werden konnte" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Zeichen für das Standardzeilenende:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Neue Dateien" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Standardzeichenkodierung (neue Dateien):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Standardzeichenkodierung (existierende Dateien):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer Dateien" -#: ../src/interface.c:3978 -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 "Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und öffnet die ausgewählten Dateien mit der angegebenen Kodierung. (Wird nur in Ausnahmen benötigt)" +#: ../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 "" +"Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und " +"öffnet die ausgewählten Dateien mit der angegebenen Kodierung. (Wird nur in " +"Ausnahmen benötigt)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Zeichenkodierungen:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile" -#: ../src/interface.c:4009 -#: ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Speichern" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Anzahl der »Zuletzt geöffneten Dateien«" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Zeitinterval zum Prüfen auf Dateiänderungen:" -#: ../src/interface.c:4070 -msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." -msgstr "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 deaktiviert die Funktion." - -#: ../src/interface.c:4079 -#: ../src/symbols.c:574 -#: ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4122 +msgid "" +"How often to check for changes to document files on disk, in seconds. Zero " +"disables checking." +msgstr "" +"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 msgid "Files" msgstr "Dateien" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen für »make« angeben" -#: ../src/interface.c:4145 -msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" -msgstr "Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)" +#: ../src/interface.c:4197 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie " +"sollte die Option -e akzeptieren)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zum Starten eines Browsers" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Pfade zu den Werkzeugen" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Kontextaktion:" -#: ../src/interface.c:4239 +#: ../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 "Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." +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 "" +"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:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Befehle" -#: ../src/interface.c:4257 -#: ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Werkzeuge" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "E-Mailadresse des Entwicklers" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernamens" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Anfangsversion:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, welche eine neue Datei zu Beginn hat" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Firmenname" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Entwickler:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" -msgstr "E-Mailadresse:" +msgstr "E-Mail-Adresse:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Jahr:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Datum / Zeit:" -#: ../src/interface.c:4382 -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 "Geben Sie ein Datumsformat für den Platzhalter {datetime} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." - -#: ../src/interface.c:4389 -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 "Geben Sie ein Datumsformat für den Platzhalter {year} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." - -#: ../src/interface.c:4396 -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 "Geben Sie ein Datumsformat für den Platzhalter {date} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." +#: ../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 "" +"Geben Sie ein Datumsformat für den Platzhalter {datetime} an. Dabei können " +"alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« " +"zum Einsatz kommen können." + +#: ../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 "" +"Geben Sie ein Datumsformat für den Platzhalter {year} an. Dabei können alle " +"Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " +"Einsatz kommen können." + +#: ../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 "" +"Geben Sie ein Datumsformat für den Platzhalter {date} an. Dabei können alle " +"Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " +"Einsatz kommen können." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Daten für Vorlagen:" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Vorlagen" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "Ä_ndern" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Tastenkürzel" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Befehl:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Ein externes Programm zum Drucken benutzen" -#: ../src/interface.c:4510 -#: ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Drucke Zeilennummern" -#: ../src/interface.c:4513 -#: ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Zeige Zeilennummern auf der gedruckten Seite" -#: ../src/interface.c:4515 -#: ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Drucke Seitenzahlen" -#: ../src/interface.c:4518 -#: ../src/printing.c:352 -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:4570 ../src/printing.c:387 +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:4520 -#: ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Drucke Seitenkopf" -#: ../src/interface.c:4523 -#: ../src/printing.c:357 -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 "Fügt drei Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, den Dateinamen sowie das Datum)." +#: ../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 "" +"Fügt drei Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, " +"den Dateinamen sowie das Datum)." -#: ../src/interface.c:4540 -#: ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Basisnamen der aktuellen Datei benutzen" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" -msgstr "Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei verwenden" +msgstr "" +"Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei " +"verwenden" -#: ../src/interface.c:4549 -#: ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Datumsformat:" -#: ../src/interface.c:4556 -#: ../src/printing.c:387 -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 "Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." +#: ../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 "" +"Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei " +"können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " +"»strftime« zum Einsatz kommen können." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "GTK-Druckunterstützung benutzen" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Drucken" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Projekteigenschaften" -#: ../src/keybindings.c:196 -#: ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Datei" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Neu" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Öffnen" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Markierte Datei öffnen" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Speichern" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Speichern unter" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Alle speichern" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Drucken" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Schließen" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Alle Schließen" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Neu laden" -#: ../src/keybindings.c:222 -#: ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Projekteigenschaften" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Zurück" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Wiederholen" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" -msgstr "Zeile oder Auswahl kopieren" +msgstr "Zeile duplizieren" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Aktuelle Zeile(n) löschen" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Zu der aktuellen Zeile rollen" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Rollt um eine Zeile nach oben" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Rollt um eine Zeile nach unten" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Vervollständige (Code-)Schnipsel" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Bewege den Cursor im Schnipsel" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln unterdrücken" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Kontextaktion" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Vervollständige Wort" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Calltip anzeigen" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Zeige Makroliste" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Zwischenablage" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Ausschneiden" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Kopieren" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Einfügen" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Aktuelle Zeile(n) kopieren" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Aktuelle Zeile(n) ausschneiden" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Auswahl" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Alles ersetzen" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Aktuelles Wort auswählen" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Aktuelle Zeile(n) auswählen" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Aktuellen Absatz auswählen" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Formatierung" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Groß- und Kleinschreibung bei Auswahl vertauschen" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Kommentierung umschalten" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Zeile(n) kommentieren" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Kommentarzeichen entfernen" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Einzug erhöhen" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Einzug verringern" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Einzug um ein Leerzeichen erhöhen" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Einzug um ein Leerzeichen verringern" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Intelligentes Einrücken" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Zum 1. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Zum 2. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Zum 3. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Auswahl an Terminal senden" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "Neuformatieren der Zeile/des Abschnitts" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Einfügen" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Datum einfügen" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Alternatives Leerzeichen einfügen" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Einstellungen" -#: ../src/keybindings.c:333 -#: ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Suchen" -#: ../src/keybindings.c:336 -#: ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Suchen" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Weitersuchen" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Vorheriges" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Auswahl vorwärts im Dokument finden" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Auswahl rückwärts im Dokument finden" -#: ../src/keybindings.c:347 -#: ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Ersetzen" -#: ../src/keybindings.c:349 -#: ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "In Dateien suchen" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Nächste Nachricht" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Vorherige Nachricht" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Auftreten finden" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Auftreten im Dokument finden" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "_Alles markieren" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Gehe zu" -#: ../src/keybindings.c:363 -#: ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Navigiert eine Position nach hinten" -#: ../src/keybindings.c:365 -#: ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Navigiert eine Position nach vorne" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Springe zur passenden Klammer" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Markierung setzen" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Zur nächsten Markierung springen" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Zur vorherigen Markierung springen" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Gehe zur Tagdefinition" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Gehe zur Tagdeklaration" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Gehe zum Zeilenanfang" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Gehe zum Zeilenende" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "Gehe zum Zeilenende" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Zum vorherigen Teilwort springen" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Zum nächsten Teilwort springen" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Ansicht" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Vollbild" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Seitenleiste ausblenden" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Hineinzoomen" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Herauszoomen" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Fokus" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Zum Editor wechseln" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Zu den Notizen wechseln" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Zur VTE wechseln" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Zu dem Suchfenster wechseln" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Zur Seitenleiste wechseln" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Wechsle zum Compiler" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Dateireiter" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Zum linken Dokument wechseln" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Zum rechten Dokument wechseln" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Zum letzten Dokument wechseln" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Dateireiter nach links verschieben" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Dateireiter nach rechts verschieben" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Dateireiter an den Anfang verschieben" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Dateireiter ans Ende verschieben" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Visuellen Zeilenumbruch umschalten" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Automatischen Zeilenumbruch umschalten" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Leerzeichen durch Tabulatoren ersetzen" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Aktuelle Faltung umschalten" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Alles einblenden" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Alles ausblenden" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Symbolliste neuladen" -#: ../src/keybindings.c:461 -#: ../src/keybindings.c:466 -#: ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Erstellen" -#: ../src/keybindings.c:464 -#: ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Kompilieren" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make Objekt-Datei" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Nächster Fehler" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Vorheriger Fehler" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Ausführen" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Ausführen (alternativer Befehl)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Farbwähler öffnen" -#: ../src/keybindings.c:490 -#: ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Hilfe" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Tastenkürzel" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgenden Tastenkürzel sind frei definierbar:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Zum Dokument wechseln" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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." +msgstr "" +"Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." -msgstr "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen werden." +msgstr "" +"Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " +"werden." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Debug-Meldungen" #: ../src/main.c:124 -msgid "Set initial column number for the first opened file (useful in conjunction with --line)" -msgstr "Setzt die Spaltennummer in der zuerst geöffneten Datei. Sinnvoll nur in Kombination mit der Option -l oder --line" +msgid "" +"Set initial column number for the first opened file (useful in conjunction " +"with --line)" +msgstr "" +"Setzt die Spaltennummer in der zuerst geöffneten Datei. Sinnvoll nur in " +"Kombination mit der Option -l oder --line" #: ../src/main.c:125 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 +#: ../src/main.c:126 ../src/main.c:146 msgid "Be verbose" msgstr "ausführliche Ausgabe" @@ -3127,7 +3232,9 @@ #: ../src/main.c:132 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" +msgstr "" +"Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " +"Instanz öffnen" #: ../src/main.c:134 msgid "Set initial line number for the first opened file" @@ -3150,7 +3257,7 @@ msgstr "Geanys Installationsverzeichnis ausgeben" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "Dateien aus der letzten Sitzung nicht laden" #: ../src/main.c:143 @@ -3165,36 +3272,45 @@ msgid "Show version and exit" msgstr "Versionsinformation anzeigen und Programm beenden" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[Dateien...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Soll es jetzt verschoben werden?" -#: ../src/main.c:633 +#: ../src/main.c:594 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." +msgstr "" +"Geany muss Ihr aktuelles Konfigurationsverzeichnis an einen neuen Ort " +"verschieben, bevor es gestartet wird." -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format -msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"." -msgstr "Ihr Konfigurationsverzeichnis wurde erfolgreich von »%s« nach »%s« verschoben." +msgid "" +"Your configuration directory has been successfully moved from \"%s\" to \"%s" +"\"." +msgstr "" +"Ihr Konfigurationsverzeichnis wurde erfolgreich von »%s« nach »%s« verschoben." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "Ihr altes Konfigurationsverzeichnis »%s« konnte nicht nach »%s« verschoben werden. Fehlermeldung: %s. Bitte führen Sie die Aktion manuell aus." +msgid "" +"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " +"Please move manually the directory to the new location." +msgstr "" +"Ihr altes Konfigurationsverzeichnis »%s« konnte nicht nach »%s« verschoben " +"werden. Fehlermeldung: %s. Bitte führen Sie die Aktion manuell aus." -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3205,23 +3321,22 @@ "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:816 -#: ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Einstellungen erneut geladen." @@ -3237,16 +3352,20 @@ msgid "_Hide Message Window" msgstr "Meldungs_fenster ausblenden" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format -msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." -msgstr "Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu kompilieren." +msgid "" +"The plugin \"%s\" is not binary compatible with this release of Geany - " +"please recompile it." +msgstr "" +"Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu " +"kompilieren." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "_Plugin Manager" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3257,136 +3376,180 @@ "Beschreibung: %s\n" "Autor(en): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Keine Plugins gefunden." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1263 -msgid "Below is a list of available plugins. Select the plugins which should be loaded when Geany is started." -msgstr "Unten ist eine Liste mit verfügbaren Plugins. Wählen Sie die Plugins aus, die beim Starten von Geany geladen werden sollen." +#: ../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:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Plugindetails" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Aktion" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Tastenkürzel" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Tasten festlegen" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "Alle a_usklappen" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "Alle _einklappen" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Aktion" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Tastenkürzel" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Ersetzen" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Diese Tastenkombination ersetzen?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Die Tastenkombination '%s' wird bereits für »%s« verwendet." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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." +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:1454 -msgid "Set the information to be used in templates. See the documentation for details." +#: ../src/prefs.c:1519 +msgid "" +"Set the information to be used in templates. See the documentation for " +"details." msgstr "" -"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden sollen.\n" -"Konsultieren Sie die Dokumentation, um mehr über die Funktionsweise von Vorlagen zu erfahren." +"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden " +"sollen.\n" +"Konsultieren Sie die Dokumentation, um mehr über die Funktionsweise von " +"Vorlagen zu erfahren." -#: ../src/prefs.c:1458 -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 "Damit die hier gemachten Änderungen an den Einstellungen wirksam werden, muss Geany neu gestartet werden oder rufen Sie »Werkzeuge->Einstellungen erneut laden« auf." +#: ../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 "" +"Damit die hier gemachten Änderungen an den Einstellungen wirksam werden, " +"muss Geany neu gestartet werden oder rufen Sie »Werkzeuge->Einstellungen " +"erneut laden« auf." #. page Keybindings -#: ../src/prefs.c:1464 -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 können die Tastenkombinationen für verschiedene Aktionen innerhalb von Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können Sie die Tastenkombinationen auch direkt eingeben." +#: ../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 "" +"Hier können die Tastenkombinationen für verschiedene Aktionen innerhalb von " +"Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, " +"einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können " +"Sie die Tastenkombinationen auch direkt eingeben." #. page Printing -#: ../src/prefs.c:1469 -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 "GTK-Druckunterstützung ist nur verfügbar wenn Geany mit GTK 2.10 (oder neuer) kompiliert wurde und Geany mit GTK 2.10 (oder neuer) ausgeführt wird." - -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "Notice: To customize the toolbar elements, edit the file 'ui_toolbar.xml'. Please see the documentation for details." -msgstr "Hinweis: Um die Werkzeugleiste anzupassen, kann die Datei »ui_toolbar.xml« bearbeitet werden. Ausführlicheres in der Dokumentation." +#: ../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 "" +"GTK-Druckunterstützung ist nur verfügbar wenn Geany mit GTK 2.10 (oder " +"neuer) kompiliert wurde und Geany mit GTK 2.10 (oder neuer) " +"ausgeführt wird." #. page Editor->Indentation -#: ../src/prefs.c:1481 -msgid "Warning: these settings are overridden by the current project. See Project->Properties." -msgstr "Hinweis: Diese Einstellungen werden überschrieben mit denen des aktuellen Projekts. Siehe Projekt->Einstellungen." +#: ../src/prefs.c:1540 +msgid "" +"Warning: these settings are overridden by the current project. See " +"Project->Properties." +msgstr "" +"Hinweis: Diese Einstellungen werden überschrieben mit denen des aktuellen " +"Projekts. Siehe Projekt->Einstellungen." + +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "Die eingestellte Schriftart für den Editor ist nicht dicktengleich." + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "Der Text wird falsch eingerückt." -#: ../src/printing.c:270 +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Seite %d von %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Dokument einrichten" -#: ../src/printing.c:375 +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" -msgstr "Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei verwenden" +msgstr "" +"Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei " +"verwenden" -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Seite %d von %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Drucken der Datei »%s« wurde abgebrochen." -#: ../src/printing.c:743 -#: ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Datei »%s« wurde gedruckt." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Drucken der Datei »%s« ist fehlgeschlagen (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." -msgstr "Bitte geben Sie zuerst einen Befehl zum Drucken in den Einstellungen an." +msgstr "" +"Bitte geben Sie zuerst einen Befehl zum Drucken in den Einstellungen an." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3397,7 +3560,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Drucken der Datei »%s« ist fehlgeschlagen (Rückgabewert: %s)." @@ -3416,611 +3579,571 @@ msgid "C_reate" msgstr "_Erstellen" -#: ../src/project.c:140 -#: ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Name:" -#: ../src/project.c:149 -#: ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Dateiname:" -#: ../src/project.c:165 -#: ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Basisverzeichnis:" -#: ../src/project.c:171 -#: ../src/project.c:434 -msgid "Base directory of all files that make up the project. This can be a new path, or an existing directory tree. You can use paths relative to the project filename." -msgstr "Basisverzeichnis aller Dateien, die zu einem Projekt gehören. Sie können sowohl ein bereits existierendes, als auch ein neu zu erstellendes Verzeichnis angeben. Weiterhin kann es sowohl in relativer als auch absoluter Form eingegeben werden." +#: ../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 "" +"Basisverzeichnis aller Dateien, die zu einem Projekt gehören. Sie können " +"sowohl ein bereits existierendes, als auch ein neu zu erstellendes " +"Verzeichnis angeben. Weiterhin kann es sowohl in relativer als auch " +"absoluter Form eingegeben werden." -#: ../src/project.c:174 -#: ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" -msgstr "Auswahl der Projektbasisverzeichnisses" +msgstr "Auswahl des Projektbasisverzeichnisses" -#: ../src/project.c:235 -#: ../src/project.c:266 -#: ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Die Projektdatei »%s« konnte nicht geladen werden." -#: ../src/project.c:260 -#: ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Projekt öffnen" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Projektdateien" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt »%s« geschlossen." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Beschreibung:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "»Make« im Basispfad ausführen" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Kommando ausführen:" -#: ../src/project.c:457 -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." +#: ../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 "" +"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." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Dateinamenmuster:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Möchten Sie das Projekt schließen bevor Sie fortfahren?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Das Projekt »%s« ist bereits geöffnet." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Der eingegebene Projektname ist zu kurz." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Sie haben einen ungültigen Dateinamen angegeben." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Soll das Projektbasisverzeichnis erstellt werden?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Der Pfad »%s« existiert nicht." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektdatei konnte nicht geschrieben werden (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Projekt »%s« erstellt." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt »%s« gespeichert." #. initialise the dialog -#: ../src/project.c:794 -#: ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Auswahl des Projektdateinamens" #. initialise the dialog -#: ../src/project.c:823 -#: ../src/project.c:834 +#: ../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:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt »%s« geöffnet." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Reguläre Ausdrücke _benutzen" -#: ../src/search.c:205 -msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." -msgstr "Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über reguläre Ausdrücke konsultieren Sie bitte die Dokumentation." +#: ../src/search.c:220 +msgid "" +"Use POSIX-like regular expressions. For detailed information about using " +"regular expressions, please read the documentation." +msgstr "" +"Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über " +"reguläre Ausdrücke konsultieren Sie bitte die Dokumentation." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "_Rückwärts suchen" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "S_onderzeichen maskieren" -#: ../src/search.c:231 +#: ../src/search.c:246 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 "" -"Ersetzt \\\\, \\t, \\n" -", \\r und \\uXXXX (Unicode-Zeichen) mit den entsprechenden Sonderzeichen" +"Ersetzt \\\\, \\t, \\n, \\r und \\uXXXX (Unicode-Zeichen) mit den " +"entsprechenden Sonderzeichen" -#: ../src/search.c:240 -#: ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "_Groß-/Kleinschreibung beachten" -#: ../src/search.c:245 -#: ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "N_ur ganze Wörter finden" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "_Wortanfänge finden" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Vorheriges" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Nächstes" -#: ../src/search.c:381 -#: ../src/search.c:520 -#: ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "Suc_he nach:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Alle finden" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Markieren" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Markiert alle Treffer innerhalb des aktuellen Dokumentes" -#: ../src/search.c:423 -#: ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "In Sit_zung" -#: ../src/search.c:428 -#: ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "_Im Dokument" #. close window checkbox -#: ../src/search.c:434 -#: ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "_Diesen Dialog schließen" -#: ../src/search.c:439 -#: ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" -msgstr "Diese Option deaktivieren, um den Dialog nicht zu schließen" +msgstr "Deaktivieren Sie diese Option um das Dialogfenster offen zu halten." -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Ersetzen und _Finden" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Erse_tzen durch:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "_Alle ersetzen" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "I_n Auswahl" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Ersetze alle Treffer im aktuell markierten Text" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Verzeichnis:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "_Kodierung" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "_Feste Zeichenketten" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Reguläre Ausdrücke _benutzen (grep)" -#: ../src/search.c:749 -#: ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" -msgstr "Für mehr Informationen konsultieren Sie bitte die Dokumentation von »grep«" +msgstr "" +"Für mehr Informationen konsultieren Sie bitte die Dokumentation von »grep«" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Erweiterte Reguläre Ausdrücke benutzen" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "_In Unterverzeichnissen" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "Su_chmuster umkehren" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Invertiert die Trefferliste" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "_Zus. Optionen:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Andere Argumente, die an grep übergeben werden sollen" -#: ../src/search.c:1068 -#: ../src/search.c:1675 -#: ../src/search.c:1678 +#: ../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] "%d Treffer für »%s« gefunden." msgstr[1] "%d Treffer für »%s« gefunden." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Ungültiges Verzeichnis." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Kein Text zum Suchen angegeben." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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)." +msgstr "" +"Konnte das grep Kommando »%s« nicht finden (Pfad zum Grep Kommando in den " +"Einstellungen überprüfen)." -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Suchen..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (im Verzeichnis: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." -msgstr "Suche fehlgeschlagen (Sie finden Details in »Hilfe -> Debug Meldungen«)." +msgstr "" +"Suche fehlgeschlagen (Sie finden Details in »Hilfe -> Debug Meldungen«)." -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Keine Treffer gefunden." -#: ../src/symbols.c:580 -#: ../src/symbols.c:621 -#: ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Kapitel" -#: ../src/symbols.c:581 -#: ../src/symbols.c:617 -#: ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Abschnitt" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Anhang" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 -#: ../src/symbols.c:622 -#: ../src/symbols.c:743 -#: ../src/symbols.c:757 -#: ../src/symbols.c:769 -#: ../src/symbols.c:781 -#: ../src/symbols.c:796 -#: ../src/symbols.c:841 +#: ../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 "Sonstiges" -#: ../src/symbols.c:593 -#: ../src/symbols.c:789 -#: ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:594 -#: ../src/symbols.c:767 -#: ../src/symbols.c:779 -#: ../src/symbols.c:794 -#: ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Typen" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Typkonstruktoren" -#: ../src/symbols.c:596 -#: ../src/symbols.c:608 -#: ../src/symbols.c:629 -#: ../src/symbols.c:638 -#: ../src/symbols.c:653 -#: ../src/symbols.c:665 -#: ../src/symbols.c:709 -#: ../src/symbols.c:722 -#: ../src/symbols.c:753 -#: ../src/symbols.c:776 -#: ../src/symbols.c:791 -#: ../src/symbols.c:828 +#: ../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 "Funktionen" -#: ../src/symbols.c:601 -#: ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Abschnitte" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Indizes" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 -#: ../src/symbols.c:655 -#: ../src/symbols.c:710 -#: ../src/symbols.c:726 -#: ../src/symbols.c:755 -#: ../src/symbols.c:768 -#: ../src/symbols.c:777 -#: ../src/symbols.c:793 -#: ../src/symbols.c:840 +#: ../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 "Variablen" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Kommando" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Umgebung" -#: ../src/symbols.c:618 -#: ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Unterabschnitt" -#: ../src/symbols.c:619 -#: ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Unterunterabschnitt" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Label" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Strukturen" -#: ../src/symbols.c:637 -#: ../src/symbols.c:736 -#: ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Package" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "My" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Our" -#: ../src/symbols.c:651 -#: ../src/symbols.c:737 -#: ../src/symbols.c:751 -#: ../src/symbols.c:764 -#: ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:652 -#: ../src/symbols.c:676 -#: ../src/symbols.c:695 -#: ../src/symbols.c:707 -#: ../src/symbols.c:738 -#: ../src/symbols.c:752 -#: ../src/symbols.c:765 -#: ../src/symbols.c:827 +#: ../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 "Klassen" -#: ../src/symbols.c:654 -#: ../src/symbols.c:756 -#: ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Konstanten" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Anker" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Überschrift (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Überschrift (H2)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Überschrift (H3)" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "ID" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Typ" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Module" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:697 -#: ../src/symbols.c:708 -#: ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:740 -#: ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Namensräume" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Prozeduren" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "Importe" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Instanzvariablen" -#: ../src/symbols.c:780 -#: ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Label" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Subroutinen" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blöcke" -#: ../src/symbols.c:804 -#: ../src/symbols.c:813 -#: ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Makros" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Definitionen" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Namensräume" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Strukturen" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typendefinition und Enumerates" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unbekannte Dateierweiterung für »%s«.\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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" +msgstr "" +"Die Tag-Datei konnte nicht erstellt werden, möglicherweise konnten keine " +"Tags gefunden werden.\n" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4029,180 +4152,198 @@ "Verwendung: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../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" +"CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" +"gtk/gtk.h\n" msgstr "" "Beispiel:\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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Tags laden" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s Tag-Datei »%s« geladen." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Konnte Tag-Datei »%s« nicht laden." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von »%s« nicht gefunden." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von »%s« nicht gefunden." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "Alle a_usklappen" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "Alle _einklappen" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Nach _Namen sortieren" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Nach _Auftreten sortieren" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: ../src/toolbar.c:52 -#: ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Alles speichern" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Speichert alle geöffnete Dateien" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Schließt alle geöffneten Dateien" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Aktuelle Auswahl ausschneiden" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Aktuelle Auswahl kopieren" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Inhalt der Zwischenablage einfügen" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Aktuelle Auswahl löschen" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Macht die letzte Änderung rückgängig" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" -#: ../src/toolbar.c:66 -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:70 +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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Text vergrößern" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Text verkleinern" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Einzug verringern" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Einzug erhöhen" -#: ../src/toolbar.c:71 -#: ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: ../src/toolbar.c:72 -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Springt zur angegebenen Zeile" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Einstellungsdialog anzeigen" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Geany beenden" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Dokument drucken" -#: ../src/toolbar.c:153 -msgid "For all changes you make in this file to take effect, you need to restart Geany." -msgstr "Um Änderungen in dieser Datei zu übernehmen ist ein Neustart von Geany erforderlich." +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "Text im aktuellen Dokument ersetzen" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Legt eine neue Datei an" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Gehe zu" +#: ../src/toolbar.c:533 +msgid "Separator" +msgstr "Trenner" + +#: ../src/toolbar.c:534 +msgid "--- Separator ---" +msgstr "---- Trenner ----" + +#: ../src/toolbar.c:897 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"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 +msgid "Available Items" +msgstr "Vorhandene Einträge" + +#: ../src/toolbar.c:934 +msgid "Displayed Items" +msgstr "Angezeigte Einträge" + #: ../src/tools.c:153 #, c-format -msgid "The executed custom command returned an error. Your selection was not changed. Error message: %s" -msgstr "Das ausgeführte Kommando wurde mit einem Fehler beendet. Die Auswahl wurde nicht geändert. Fehlermeldung: %s" +msgid "" +"The executed custom command returned an error. Your selection was not " +"changed. Error message: %s" +msgstr "" +"Das ausgeführte Kommando wurde mit einem Fehler beendet. Die Auswahl wurde " +"nicht geändert. Fehlermeldung: %s" #: ../src/tools.c:219 msgid "The executed custom command exited with an unsuccessful exit code." @@ -4218,17 +4359,19 @@ 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:538 msgid "Set Custom Commands" msgstr "Benutzerdefiniertes Kommandos einstellen" #: ../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 "Sie können die aktuelle Auswahl an ein benutzerdefiniertes Kommando senden. Die aktuelle Auswahl wird durch die Ausgabe des Kommandos ersetzt." +msgid "" +"You can send the current selection to any of these commands and the output " +"of the command replaces the current selection." +msgstr "" +"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:506 ../src/tools.c:510 msgid "No custom commands defined." msgstr "Keine Kommandos definiert." @@ -4260,126 +4403,144 @@ msgid "Characters:" msgstr "Buchstaben:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Keine Symbole gefunden" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "S_ymbolliste anzeigen" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "_Dokumentenliste anzeigen" -#: ../src/treeviews.c:506 -#: ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Seitenleiste _verstecken" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "_Pfade anzeigen" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "Zeile: %d\t Spalte: %d\t Markiert: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "ÜBER" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "EINFG" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "Tab" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "Leer" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/L" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "Modus: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "Zeichensatz: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "Dateityp: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "Bereich: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C Standard Bibliothek" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Bibliothek)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ Standard Bibliothek" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Benutzerdefiniertes Datumsformat einstellen" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Ordner wählen" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Datei wählen" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "_Konfigurationsdateien" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Alles speichern" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Alle schließen" -#: ../src/vte.c:301 -#: ../src/vte.c:726 +#: ../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 "Terminal" @@ -4396,16 +4557,24 @@ msgstr "Eingabe_methoden" #: ../src/vte.c:670 -msgid "Could not change the directory in the VTE because it probably contains a command." -msgstr "Konnte das Verzeichnis in der VTE nicht wechseln. Eventuell steht ein Befehl auf der Kommandozeile." +msgid "" +"Could not change the directory in the VTE because it probably contains a " +"command." +msgstr "" +"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." +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:" @@ -4436,7 +4605,9 @@ msgstr "Zeilen zum Zurückrollen:" #: ../src/vte.c:790 -msgid "Specifies the history in lines, which you can scroll back in the terminal widget" +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 @@ -4444,7 +4615,9 @@ msgstr "Shell:" #: ../src/vte.c:802 -msgid "Sets the path to the shell which should be started inside the terminal emulation" +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 @@ -4453,7 +4626,9 @@ #: ../src/vte.c:820 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" +msgstr "" +"Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gerollt werden " +"soll" #: ../src/vte.c:823 msgid "Scroll on output" @@ -4476,25 +4651,35 @@ msgstr "Geanys Tastenkombination überschreiben" #: ../src/vte.c:833 -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)" +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 msgid "Disable menu shortcut key (F10 by default)" msgstr "Me_nütastenkombination deaktivieren (Vorgabe ist 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 "Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight Commander in der VTE benutzen möchten." +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 "" +"Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine " +"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:840 ../plugins/filebrowser.c:1122 msgid "Follow the path of the current file" msgstr "Pfad der aktuellen Datei setzen" #: ../src/vte.c:841 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 geöffneten Dateien wechseln" +msgstr "" +"Legt fest, ob »cd $path« in der VTE ausgeführt werden soll, wenn Sie zwischen " +"geöffneten Dateien wechseln" #. 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 @@ -4503,327 +4688,322 @@ msgstr "Das Run-Skript nicht benutzen" #: ../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 "Das Run-Skript, welches gewöhnlich zur Ausgabe des Rückgabe-Wertes eines ausgeführten Programms genutzt wird, nicht benutzen" +msgid "" +"Don't use the simple run script which is usually used to display the exit " +"status of the executed program" +msgstr "" +"Das Run-Skript, welches gewöhnlich zur Ausgabe des Rückgabe-Wertes eines " +"ausgeführten Programms genutzt wird, nicht benutzen" #: ../src/vte.c:850 msgid "Execute programs in VTE" msgstr "Führe Programme in der VTE aus" #: ../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 "Führt Programme in der VTE aus, anstatt ein neues Terminalfenster zu öffnen. Achtung: Programme die in der VTE ausgeführt werden, können nicht gestoppt werden." +msgid "" +"Run programs in VTE instead of opening a terminal emulation window. Please " +"note, programs executed in VTE cannot be stopped" +msgstr "" +"Führt Programme in der VTE aus, anstatt ein neues Terminalfenster zu öffnen. " +"Achtung: Programme die in der VTE ausgeführt werden, können nicht gestoppt " +"werden." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geany Projektdateien" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" -msgstr "Ausführbare" +msgstr "Ausführbare Dateien" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Fehler" - -#: ../src/win32.c:581 -#: ../src/win32.c:640 -msgid "Question" -msgstr "Frage" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Warnung" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Information" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Klassengenerator" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Erstellt neue Klassen in einer neuen Datei" -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Klasse erstellen" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Klasse" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Klassenname:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Headerdatei:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Quelldatei:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Typ der Vererbung:" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Basisklasse:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Basis Headerdatei:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Basis GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Optionen" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Konstruktor erstellen" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Dekonstruktor erstellen" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+-Konstruktor Typ" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Klasse _erstellen" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "_C++-Klasse" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "_GTK+-Klasse" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Zeichen für HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Fügt HTML-Sonderzeichen wie »&« ein." -#: ../plugins/htmlchars.c:48 -#: ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 -#: ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Das Geany-Entwicklerteam" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Zeichen für HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Zeichen nach ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Griechische Buchstaben" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Mathematische Symbole" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Technische Symbole" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Pfeilsymbole" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Zeichen für Interpunktion" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Sonstige Zeichen" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Sonderzeichen" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Einfügen" -#: ../plugins/htmlchars.c:467 -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 "Wählen Sie das gesuchte Sonderzeichen aus der Liste aus und fügen Sie es mit einem Doppelklick oder über den Button »Einfügen« in Ihr aktuelles Dokument ein." +#: ../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 "" +"Wählen Sie das gesuchte Sonderzeichen aus der Liste aus und fügen Sie es mit " +"einem Doppelklick oder über den Button »Einfügen« in Ihr aktuelles Dokument " +"ein." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Zeichen" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (Name)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_HTML-Sonderzeichen einfügen" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "Ersetzen von HTML-Sonderzeichen" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "_Eingabeersetzung für Sonderzeichen ein-/ausschalten" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Sonderzeichen ersetzen" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "HTML-Sonderzeichen einfügen" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Sonderzeichen ersetzen" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Ein-/Ausschalten der Eingabeersetzung" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Exportieren" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exportiert eine aktuelle Datei in verschiedene Dateiformate." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Datei exportieren" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Aktuelle Vergrößerungsstufe benutzen" -#: ../plugins/export.c:193 -msgid "Renders the font size of the document together with the current zoom level" +#: ../plugins/export.c:185 +msgid "" +"Renders the font size of the document together with the current zoom level" msgstr "Vergrößerungsstufe in das exportierte Dokument übernehmen" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokument erfolgreich als »%s« exportiert." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Die Datei »%s« konnte nicht geschrieben werden (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Exportieren" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Als _HTML exportieren" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Als _LaTeX exportieren" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Dateibrowser" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Fügt einen Dateimanager in die Seitenleiste ein." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Zu viele Elemente ausgewählt!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Kann angegebenen externen Befehl »%s« nicht ausführen (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Mit _externer Anwendung öffnen" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "In _Dateien suchen" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "V_ersteckte Dateien anzeigen" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Aufwärts" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Neu laden" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Persönliches Verzeichnis" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Pfad des Dokumentes übernehmen" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Filter löschen" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Dateiliste in den Vordergrund" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Pfad in den Vordergrund" -#: ../plugins/filebrowser.c:1067 -#: ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "Plugin-Konfigurationsverzeichnis konnte nicht erstellt werden." @@ -4834,13 +5014,17 @@ #: ../plugins/filebrowser.c:1101 #, 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 "" -"Befehl zum Ausführen bei »Öffnen mit«. Sie können %f und %d Platzhalter benutzen,\n" +"Befehl zum Ausführen bei »Öffnen mit«. Sie können %f und %d Platzhalter " +"benutzen,\n" "%f wird durch den Dateinamen mit komplettem Pfad ersetzt.\n" -"%d wird durch den Pfadnamen der ausgewählten Datei ersetzt (ohne den Dateinamen)." +"%d wird durch den Pfadnamen der ausgewählten Datei ersetzt (ohne den " +"Dateinamen)." #: ../plugins/filebrowser.c:1107 msgid "Show hidden files" @@ -4851,42 +5035,49 @@ msgstr "Objektdateien verbergen" #: ../plugins/filebrowser.c:1117 -msgid "Don't show generated object files in the file browser, this includes *.o, *.obj. *.so, *.dll, *.a, *.lib" -msgstr "Erzeugte Objektdateien nicht im Dateibrowser anzeigen (*.o, *.obj. *.so, *.dll, *.a, *.lib)" +msgid "" +"Don't show generated object files in the file browser, this includes *.o, *." +"obj. *.so, *.dll, *.a, *.lib" +msgstr "" +"Erzeugte Objektdateien nicht im Dateibrowser anzeigen (*.o, *.obj. *.so, *." +"dll, *.a, *.lib)" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" -msgstr "Dem Projekt-Basisverzeichnis folgen" +msgid "Use the project's base directory" +msgstr "Das Projekt-Basisverzeichnis nutzen" #: ../plugins/filebrowser.c:1132 -msgid "Change the directory to the base directory of the currently opened project" -msgstr "Das aktuelle Verzeichnis beim Öffnen eines Projekts dem Basisverzeichnis des Projekts anpassen" +msgid "" +"Change the directory to the base directory of the currently opened project" +msgstr "" +"Das aktuelle Verzeichnis beim Öffnen eines Projekts dem Basisverzeichnis des " +"Projekts anpassen" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Speicheraktionen" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "Bietet verschiedene Funktionen rund um das Speichern von Dateien." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Backup Copy: Verzeichnis konnte nicht erstellt werden (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Backup Copy: Datei konnte nicht gelesen werden (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Backup Copy: Datei konnte nicht gespeichert werden (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4894,487 +5085,103 @@ msgstr[1] "Automatisches Speichern: %d Dateien wurden gespeichert." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Verzeichnis wählen" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Sicherungsverzeichnis existiert nicht oder ist nicht beschreibbar." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Automatisches Speichern" -#: ../plugins/saveactions.c:553 -#: ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "A_ktivieren" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Interval für Autospeicherung:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "Sekunden" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "_Statusmeldung ausgeben, wenn Dateien automatisch gespeichert wurden" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "_Nur aktuell aktive Datei speichern" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "A_lle geöffneten Dateien speichern" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Instant Save" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "_Dateityp der zu öffnenden Datei:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Backup Copy" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Verzeichnis zum Speichern der Sicherheitskopien" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "_Datums- und Zeitformat für Sicherungsdateien:" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Verzeichnis_ebenen die im Zielpfad übernommen werden sollen:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Fenster teilen" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Teilt das Editorfenster in zwei Teilfenster." -#: ../plugins/splitwindow.c:285 -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Zeige das aktuelle Dokument" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "Teilung _aufheben" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "Fenster _teilen" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Horizontal" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Vertikal" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Horizontal teilen" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Vertikal teilen" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "Teilung aufheben" - -#~ msgid "Failed to view %s (make sure it is already compiled)" -#~ msgstr "" -#~ "Konnte »%s« nicht anzeigen (die Datei muss bereits erzeugt worden sein)" -#~ 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." -#~ msgid "Jump to the entered line number." -#~ msgstr "Springt zur angegebenen Zeile" -#~ msgid "Version Diff" -#~ msgstr "Version Diff" -#~ msgid "Creates a patch of a file against version control." -#~ msgstr "Erstellt einen Patch einer Datei gegen ein Versionskontrollsystem." -#~ msgid "Input conversion of the diff output failed." -#~ msgstr "Die Konvertierung in die Diff-Ausgabe ist fehlgeschlagen." -#~ msgid "" -#~ "%s exited with an error: \n" -#~ "%s." -#~ msgstr "" -#~ "%s endete mit einem Fehler: \n" -#~ "%s." -#~ msgid "No changes were made." -#~ msgstr "Es wurden keine Änderungen vorgenommen." -#~ msgid "unknown error while trying to spawn a process for %s" -#~ msgstr "Unbekannter Fehler beim Versuch, den Prozess »%s« auszuführen." -#~ msgid "An error occurred (%s)." -#~ msgstr "Ein Fehler ist aufgetreten (%s)." -#~ msgid "_Version Diff" -#~ msgstr "_Version Diff" -#~ msgid "From Current _File" -#~ msgstr "Von der aktuellen _Datei" -#~ msgid "Make a diff from the current active file" -#~ msgstr "Erstellt ein Diff für die aktuelle Datei." -#~ msgid "From Current _Directory" -#~ msgstr "Vom aktuellen _Verzeichnis" -#~ msgid "Make a diff from the directory of the current active file" -#~ msgstr "Erstellt ein Diff für das Verzeichnis der aktuellen Datei" -#~ msgid "From Current _Project" -#~ msgstr "Vom aktuellen _Projekt" -#~ msgid "Make a diff from the current project's base path" -#~ msgstr "Erstellt ein Diff für das aktuell geöffnete Projekt" -#~ msgid "Compiles the current file" -#~ msgstr "Kompiliert die aktuelle Datei" -#~ msgid "Builds the current file (generate an executable file)" -#~ msgstr "Kompiliert die aktuelle Datei (erzeugt eine ausführbare Datei)" -#~ msgid "Compiles the current file using the make tool" -#~ msgstr "Kompiliert die aktuelle Datei mittels »make«" -#~ msgid "" -#~ "Sets the includes and library paths for the compiler and the program " -#~ "arguments for execution" -#~ msgstr "" -#~ "Include-Dateien, Pfade zu den Bibliotheken sowie Programmparameter " -#~ "festlegen" -#~ msgid "Compiles the current file into a DVI file" -#~ msgstr "Kompiliert die aktuelle Datei als DVI-Datei." -#~ msgid "Compiles the current file into a PDF file" -#~ msgstr "Kompiliert die aktuelle Datei als PDF-Datei." -#~ msgid "Compile and view the current file" -#~ msgstr "Kompiliert und zeigt die aktuelle Datei an" -#~ msgid "Sets the program paths and arguments" -#~ msgstr "Programmpfade und Parameter festlegen" -#~ msgid "Show full path name in documents list" -#~ msgstr "Zeige den vollständigen Pfad in der Dokumentenliste an" -#~ msgid "Show _Full Path Name" -#~ msgstr "Vollständigen _Pfad anzeigen" -#~ msgid "Saves all open files" -#~ msgstr "Speichert alle offenen Dateien" -#~ msgid "Prints the current file" -#~ msgstr "Druckt die aktuelle Datei" -#~ msgid "Closes all open files" -#~ msgstr "Schließt alle geöffneten Dateien" -#~ msgid "Convert the case of the current selection" -#~ msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#~ msgid "Inserts a typical ChangeLog entry in the current file" -#~ msgstr "Fügt einen typischen ChangeLog-Eintrag an den Anfang der Datei ein." -#~ msgid "Inserts a file header at the beginning of the file" -#~ msgstr "Fügt einen Dateikopf am Anfang einer neu erzeugten Datei ein." -#~ msgid "Inserts a description before the current function" -#~ msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#~ msgid "Inserts a multiline comment" -#~ msgstr "Fügt einen mehrzeiligen Kommentar ein." -#~ msgid "Inserts a GPL notice (should be done at the beginning of the file)" -#~ msgstr "" -#~ "Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer " -#~ "Datei sein)." -#~ msgid "" -#~ "Inserts a BSD license notice (should be done at the beginning of the file)" -#~ msgstr "" -#~ "Fügt einen kurzen Lizenz-Hinweis auf die BSD-Lizenz ein (sollte am Anfang " -#~ "einer Datei sein)." -#~ msgid "Change the default font" -#~ msgstr "Ändert die Standardschriftart für das Editorfenster" -#~ msgid "Toggle the window with status and compiler messages on and off" -#~ msgstr "" -#~ "Blendet den Infobereich mit Meldungen, Compiler-Ausgaben, Notizen etc. " -#~ "ein oder aus." -#~ msgid "Toggle the toolbar on and off" -#~ msgstr "Blendet die Anzeige der Werkzeugleiste an und aus." -#~ msgid "Treat this file as read-only. No changes can be made." -#~ msgstr "" -#~ "Datei als schreibgeschützt behandeln. Es können keine Änderungen an der " -#~ "Datei vorgenommen werden." -#~ msgid "Replaces all spaces in the document by tab characters." -#~ msgstr "Ersetzt alle Leerzeichen im Dokument durch Tabulatoren." -#~ msgid "Folds all contractible code blocks" -#~ msgstr "Klappt alle ausblendbaren Quelltext-Blöcke ein." -#~ msgid "Unfolds all contracted code blocks" -#~ msgstr "Blendet alle ausgeblendeten Quelltext-Blöcke wieder ein." -#~ msgid "Removes all error indicators in the current document." -#~ msgstr "" -#~ "Entfernt alle gesetzten Fehlermarkierungen innerhalb des Dokumentes." -#~ msgid "" -#~ "Open a color chooser dialog, to interactively pick colors from a palette." -#~ msgstr "" -#~ "Öffnet einen Farbauswahldialog zum Auswählen einer Farbe von einer " -#~ "Palette." -#~ msgid "" -#~ "Counts the words and characters in the current selection or the whole " -#~ "document" -#~ msgstr "" -#~ "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen " -#~ "Dokument." -#~ msgid "Load global tags file" -#~ msgstr "Globale Tags-Datei laden" -#~ msgid "" -#~ "Reload configuration data like snippets, templates and filetype " -#~ "extensions." -#~ msgstr "" -#~ "Lädt die Einstellungen der (Code-)Schnipsel, Vorlagen und " -#~ "Dateierweiterungen erneut." -#~ msgid "Shows a list of all keyboard shortcuts for Geany." -#~ msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#~ msgid "Go to the entered line" -#~ msgstr "Springe zu angegebener Zeile" -#~ msgid "Use white text on a black background." -#~ msgstr "Benutze weiße Schrift auf einem schwarzem Hintergrund" -#~ msgid "Runs in debug mode (means being verbose)" -#~ msgstr "Geany im Debug-Modus ausführen (ausführliche Ausgabe)" -#~ msgid "Command stopped because the current file has no extension." -#~ msgstr "" -#~ "Die Ausführung des Kommandos wurde unterbrochen, da die Datei keine " -#~ "Dateiendung besitzt." -#~ msgid "Failed to execute \"%s\" (make sure it is already built)" -#~ msgstr "" -#~ "Konnte »%s« nicht ausführen (die Datei muss bereits erzeugt worden sein)" -#~ msgid "Heading (H2)" -#~ msgstr "Überschrift (H2)" -#~ msgid "Heading (H3)" -#~ msgstr "Überschrift (H3)" -#~ msgid "Structs / Typedefs" -#~ msgstr "Structs / Typedefs" -#~ msgid "JavaScript functions" -#~ msgstr "Javascript-Funktionen" -#~ msgid "Color" -#~ msgstr "Farbwähler" -#~ msgid "Enter a line number and jump to it." -#~ msgstr "Geben Sie die Zeilennummer ein, zu der Sie springen möchten." -#~ msgid "Show File Operation buttons" -#~ msgstr "Dateioperationssymbole anzeigen" -#~ msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -#~ msgstr "" -#~ "Zeigt die Symbole für Neu, Öffnen, Schließen und Neuladen in der " -#~ "Werkzeugleiste." -#~ msgid "Show Cut and Delete buttons" -#~ msgstr "Schaltflächen zum Ausschneiden und Löschen anzeigen" -#~ msgid "Display the Cut and Delete buttons in the toolbar" -#~ msgstr "" -#~ "Zeigt die Symbole zum Ausschneiden und Löschen in der Werkzeugleiste." -#~ msgid "Show Copy and Paste buttons" -#~ msgstr "Schaltflächen zum Kopieren und Einfügen anzeigen" -#~ msgid "Display the Copy and Paste buttons in the toolbar" -#~ msgstr "Zeigt die Symbole zum Kopieren und Einfügen in der Werkzeugleiste." -#~ msgid "Show Redo and Undo buttons" -#~ msgstr "Rückgängig und Wiederholen anzeigen" -#~ msgid "Display the Redo and Undo buttons in the toolbar" -#~ msgstr "" -#~ "Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der " -#~ "Werkzeugleiste." -#~ msgid "Show Back and Forward buttons" -#~ msgstr "Schaltflächen zur Vorwärts- und Rückwärtsnavigation anzeigen" -#~ msgid "" -#~ "Display the Back and Forward buttons in the toolbar used for code " -#~ "navigation" -#~ msgstr "" -#~ "Zeigt die Schaltflächen zur Vorwärts- und Rückwärtsnavigation innerhalb " -#~ "der Quelltexte in der Werkzeugliste an." -#~ msgid "Show Compile and Run buttons" -#~ msgstr "Schaltflächen zum Kompilieren und Ausführen anzeigen" -#~ msgid "Display the Compile and Run buttons in the toolbar" -#~ msgstr "" -#~ "Zeigt die Symbole zum Kompilieren und Ausführen in der Werkzeugleiste." -#~ msgid "Show Color Chooser button" -#~ msgstr "Farbwähler anzeigen" -#~ msgid "Display the Color Chooser button in the toolbar" -#~ msgstr "Zeigt das Farbwählersymbol in der Werkzeugleiste." -#~ msgid "Show Zoom In and Zoom Out buttons" -#~ msgstr "Schaltflächen zum Heran- und Wegzoomen anzeigen" -#~ msgid "Display the Zoom In and Zoom Out buttons in the toolbar" -#~ msgstr "" -#~ "Zeigt die Symbole zum Heran- und Herauszoomen in der Werkzeugleiste." -#~ msgid "Show Increase and Decrease Indentation buttons" -#~ msgstr "Schaltflächen zum Verringern/Erhöhen des Einzugs anzeigen" -#~ msgid "Display the Increase and Decrease Indentation buttons in the toolbar" -#~ msgstr "" -#~ "Zeigt die Symbole zum Ein- und Ausrücken von Quelltext in der " -#~ "Werkzeugleiste an." -#~ msgid "Show Search field" -#~ msgstr "Suchfeld anzeigen" -#~ msgid "Display the search field and button in the toolbar" -#~ msgstr "Zeigt das Suchfeld in der Werkzeugleiste an." -#~ msgid "Show Go to Line field" -#~ msgstr "Springe zu Zeile-Eingabefeld anzeigen" -#~ msgid "Display the line number field and button in the toolbar" -#~ msgstr "" -#~ "Zeigt das Eingabefeld um in eine bestimmte Zeile zu springen in der " -#~ "Werkzeugleiste an." -#~ msgid "Show Quit button" -#~ msgstr "Schaltfläche Beenden anzeigen" -#~ msgid "Display the quit button in the toolbar" -#~ msgstr "" -#~ "Zeigt die Schaltfläche zum Beenden von Geany in der Werkzeugleiste an." -#~ msgid "Items" -#~ msgstr "Symbole" -#~ msgid "Couldn't find pixmap file: %s" -#~ msgstr "Konnte PixMap »%s« nicht finden." -#~ msgid "Terminal emulation:" -#~ msgstr "Terminalemulation:" -#~ msgid "" -#~ "Controls how the terminal emulator should behave. Do not change this " -#~ "value unless you know exactly what you are doing." -#~ msgstr "" -#~ "Steuert, wie sich die Terminal Emulation verhalten soll . Ändern Sie " -#~ "diese Werte nur, wenn sie wissen was Sie tun." -#~ msgid "Search failed." -#~ msgstr "Suche schlug fehl." -#~ msgid "Found %d matches 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." -#~ msgid "Failed to execute the terminal program" -#~ msgstr "Konnte das Terminal-Programm nicht ausführen." -#~ msgid "Save automatically all open files in a given time interval." -#~ msgstr "" -#~ "Speichert automatisch alle geöffneten Dateien im angegeben Zeitintervall." -#~ msgid "Whether to use tabs or spaces when indentation is inserted." -#~ msgstr "" -#~ "Legt fest, ob entweder Leerzeichen oder Tabulatoren zum Einrücken genutzt " -#~ "werden sollen." -#~ msgid "Rows of symbol completion list:" -#~ msgstr "Anzahl der Zeilen der Vervollständigungsliste:" -#~ msgid "Strip trailing spaces" -#~ msgstr "_Leerzeichen am Zeilenende entfernen" -#~ msgid "Could not parse the output of the diff" -#~ msgstr "Kann die Ausgabe von »diff« nicht einlesen." -#~ msgid "pos: %d" -#~ msgstr "Pos: %d" -#~ msgid "Something very strange is occurred, could not stat %s (%s)." -#~ msgstr "Ein Fehler ist aufgetreten, konnte Datei %s nicht prüfen (%s)." -#~ msgid "Insert Comments" -#~ msgstr "Kommentare einfügen" -#~ msgid "Insert \"include <...>\"" -#~ msgstr "\"include <...>\" einfügen" -#~ msgid "File menu" -#~ msgstr "Datei-Menü" -#~ msgid "Edit menu" -#~ msgstr "Bearbeiten-Menü" -#~ msgid "Search menu" -#~ msgstr "Suchen-Menü" -#~ msgid "View menu" -#~ msgstr "Ansicht-Menü" -#~ msgid "Document menu" -#~ msgstr "Dokument-Menü" -#~ msgid "Build menu" -#~ msgstr "Erstellen-Menü" -#~ msgid "Tools menu" -#~ msgstr "Werkzeugmenü" -#~ msgid "Help menu" -#~ msgstr "Hilfe-Menü" -#~ msgid "Focus commands" -#~ msgstr "Fokus-Kommandos" -#~ msgid "Editing commands" -#~ msgstr "Editor-Kommandos" -#~ msgid "Tag commands" -#~ msgstr "Tag-Kommandos" -#~ msgid "Other commands" -#~ msgstr "Andere Kommandos" -#~ msgid "Something went really wrong." -#~ msgstr "Etwas ist schief gelaufen." -#~ msgid "_VCdiff" -#~ msgstr "_VCdiff" -#~ msgid "" -#~ "VCdiff command sent errors:\n" -#~ "%s\n" -#~ "." -#~ msgstr "" -#~ "VCdiff hat einen Fehler zurück gegeben:\n" -#~ "%s\n" -#~ "." -#~ msgid "Open _with ..." -#~ msgstr "Öffnen _mit..." -#~ msgid "C++ source file" -#~ msgstr "C++ Quelldatei" -#~ msgid "C# source file" -#~ msgstr "C# Quelldatei" -#~ msgid "D source file" -#~ msgstr "D Quelldatei" -#~ msgid "Java source file" -#~ msgstr "Java Quelldatei" -#~ msgid "Pascal source file" -#~ msgstr "Pascal Quelldatei" -#~ msgid "Assembler source file" -#~ msgstr "Assembler Quelldatei" -#~ msgid "FreeBasic source file" -#~ msgstr "FreeBasic Quelldatei" -#~ msgid "Fortran source file (F77)" -#~ msgstr "Fortran (F77) Quelldatei" -#~ msgid "(O)Caml source file" -#~ msgstr "(O)Caml Quelldatei" -#~ msgid "Perl source file" -#~ msgstr "Perl Quelldatei" -#~ msgid "PHP source file" -#~ msgstr "PHP Quelldatei" -#~ msgid "Python source file" -#~ msgstr "Python Quelldatei" -#~ msgid "Ruby source file" -#~ msgstr "Ruby Quelldatei" -#~ msgid "Tcl source file" -#~ msgstr "Tcl Quelldatei" -#~ msgid "Lua source file" -#~ msgstr "Lua Quelldatei" -#~ msgid "Ferite source file" -#~ msgstr "Ferite Quelldatei" -#~ msgid "Haskell source file" -#~ msgstr "Haskell Quelldatei" -#~ msgid "Docbook source file" -#~ msgstr "Docbook Quelldatei" -#~ msgid "HTML source file" -#~ msgstr "HTML Quelldatei" -#~ msgid "LaTeX source file" -#~ msgstr "LaTeX Quelldatei" -#~ msgid "O-Matrix source file" -#~ msgstr "O-Matrix Quelldatei" -#~ msgid "VHDL source file" -#~ msgstr "VHDL Quelldatei" -#~ msgid "Haxe source file" -#~ msgstr "Haxe Quelldatei" -#~ msgid "Unfold all children of a fold point when unfolding it." -#~ msgstr "" -#~ "Klappt alle ausgeblendeten Codeblöcke einer Stelle im Quellcode mit aus." -#~ msgid "Construct autocompletion" -#~ msgstr "Autovervollständigung von Konstrukten" -#~ msgid "Automatic completion of often used constructs like if and for" -#~ msgstr "" -#~ "Autovervollständigung von häufig benutzten Konstrukten wie if, for und " -#~ "switch." -#~ msgid "Print:" -#~ msgstr "Drucken:" -#~ msgid "Mixins" -#~ msgstr "Mixins" -#~ msgid "SVNdiff" -#~ msgstr "SVNdiff" -#~ msgid "Something went really wrong. Is there any svn-binary in your path?" -#~ msgstr "Irgendetwas ist schief gelaufen. Befindet sich svn Suchpfad?" -#~ msgid "_Hide" -#~ msgstr "_Verstecken" -#~ msgid "Could not determine a path to work in" -#~ msgstr "Konnte den Pfad nicht bestimmen." -#~ msgid "Current file has no changes." -#~ msgstr "Die aktuelle Datei besitzt keine Veränderungen." -#~ msgid "File is unnamed. Can't go on with processing." -#~ msgstr "Die Datei besitzt keinen Namen. Abbruch." -#~ msgid "" -#~ "Make a diff from the current project's base path, or if there is no " -#~ "project open, from the directory of the current active file" -#~ msgstr "" -#~ "Erstellt ein diff ausgehend vom Basispfad eines geöffneten Projektes. Ist " -#~ "kein Projekt geöffnet, bildet das Verzeichnis, in dem sich die aktuell " -#~ "aktive Datei befindet die Grundlage, für den diff." -#~ msgid "" -#~ "Directory to run Make All from. Leave blank to use the default command." -#~ msgstr "" -#~ "Verzeichnis, in dem ein Make All durchgeführt werden soll. Um die " -#~ "Standardeinstellungen zu benutzen, dieses Feld leer lassen." - diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/el.po /tmp/ssBwSf4GIv/geany-0.18/po/el.po --- geany-0.17/po/el.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/el.po 2009-08-16 17:18:28.000000000 +0100 @@ -6,9 +6,9 @@ # Stavros Temertzidis , 2008. msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2008-02-01 12:02+0200\n" "Last-Translator: Stavros Temertzidis \n" "Language-Team: Greek\n" @@ -30,68 +30,68 @@ msgid "Integrated Development Environment" msgstr "Ενιαίο Περιβάλλον Ανάπτυξης" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Περί Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Γρήγορο και ελαφρύ IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(δημιουργήθηκε την ή μετά %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Πληροφορίες" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Δημιουργοί" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "υπεύθυνος" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "δημιουργός" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "υπεύθυνος μετάφρασης" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Μεταφραστές" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Προηγούμενοι Μεταφραστές" -#: ../src/about.c:330 +#: ../src/about.c:332 #, fuzzy msgid "Contributors" msgstr "Δημιουργία κατασκευής" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Μνεία" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Άδεια Χρήσης" -#: ../src/about.c:389 +#: ../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." @@ -99,7 +99,7 @@ "Δεν βρέθηκε το κείμενο της άδειας χρήσης, παρακαλώ επισκεφθείτε το http://" "www.gnu.org/licenses/gpl-2.0.txt να το δείτε online." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -108,144 +108,144 @@ "Δεν ήταν δυνατόν να βρεθεί το τερματικό \"%s\" (ελέγξτε τη διαδρομή στις " "ρυθμίσεις εργαλείων του τερματικού στις ιδιότητες)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "" "Αποτυχία εκτέλεσης \"%s\" (δεν ήταν δυνατόν να δημιουργηθεί το script " "εκκίνησης)" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Η διαδικασία απέτυχε (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (στο φάκελο: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Αποτυχία μετάβασης στο φάκελο εργασίας \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Δεν ήταν δυνατόν να εκτελεστεί το αρχείο στο VTE επειδή πιθανόν να " "περιλαμβάνει μια εντολή." -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Αποτυχία μεταγλώτισης." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Η μεταγλώτιση ολοκληρώθηκε με επιτυχία." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Μεταγλώτιση" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 #, fuzzy msgid "_Build" msgstr "_Δημιουργία" #. build the code with make all -#: ../src/build.c:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Δημιουργία _Προσαρμοσμένου Προορισμού" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Δημιουργία _Αντικειμένου" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Επόμενο Σφάλμα" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 #, fuzzy msgid "_Previous Error" msgstr "_Προηγούμενο" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 #, fuzzy msgid "_Set Includes and Arguments" msgstr "_Καθορισμός των Περιεχομένων και Επιχειρημάτων" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 #, fuzzy msgid "LaTeX -> _DVI" msgstr "LaTeX -> DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 #, fuzzy msgid "LaTeX -> _PDF" msgstr "LaTeX -> PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 #, fuzzy msgid "_View DVI File" msgstr "Προβολή Αρχείου DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 #, fuzzy msgid "V_iew PDF File" msgstr "Προβολή Αρχείου PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 #, fuzzy msgid "_Set Arguments" msgstr "Καθορισμός Επιχειρημάτων" -#: ../src/build.c:1319 +#: ../src/build.c:1306 #, fuzzy msgid "Set Arguments" msgstr "Καθορισμός Επιχειρημάτων" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" "Καθορισμός προγραμμάτων και επιλογών για μεταγλώτιση και προβολή αρχείων (La)" "TeX" -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Δημιουργία DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Δημιουργία PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Προεπισκόπηση DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Προεπισκόπηση PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -255,80 +255,80 @@ "%e θα αντικατασταθεί με το τρέχον όνομα αρχείου χωρίς προέκταση, π.χ. " "test_file" -#: ../src/build.c:1499 +#: ../src/build.c:1486 #, fuzzy msgid "Set Includes and Arguments" msgstr "Καθορισμός των Περιεχομένων και των Επιχειρημάτων" -#: ../src/build.c:1506 +#: ../src/build.c:1493 #, fuzzy msgid "Set the commands for building and running programs." msgstr "Καθορισμός των εντολών για δημιουργία και εκτέλεση προγραμμάτων." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s εντολές" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Μεταγλώτιση:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 #, fuzzy msgid "Build:" msgstr "Δημιουργία:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Εκτέλεση:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 #, fuzzy msgid "Build the current file" msgstr "Μεταγλώτιση του τρέχοντος αρχείου" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Δημιουργία Προσαρμοσμένου Προορισμού" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Εισάγετε τις προσαρμοσμένες επιλογές εδώ, όλο το εισακτέο κείμενο θα " "μεταφερθεί στην εντολή δημιουργίας" -#: ../src/build.c:1976 +#: ../src/build.c:1967 #, fuzzy msgid "Build the current file with Make and the default target" msgstr "" "Δημιουργεί το τρέχον αρχείο με το εργαλείο δημιουργίας και το προεπιλεγμένο " "προορισμό" -#: ../src/build.c:1979 +#: ../src/build.c:1970 #, fuzzy msgid "Build the current file with Make and the specified target" msgstr "" "Δημιουργεί το τρέχον αρχείο με το εργαλείο δημιουργίας και το καθορισμένο " "προορισμό" -#: ../src/build.c:1982 +#: ../src/build.c:1973 #, fuzzy msgid "Compile the current file with Make" msgstr "Μεταγλώτιση του τρέχοντος αρχείου" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Αποτυχία εκτέλεσης του προγράμματος προβολής" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Αδύνατη η διακοπή της διαδικασίας (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 #, fuzzy msgid "No more build errors." msgstr "Δεν έχει άλλα λάθη στη δημιουργία." @@ -337,8 +337,8 @@ msgid "Do you really want to quit?" msgstr "Θέλετε πραγματικά να εγκαταλείψετε;" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Επαναφόρτωση" @@ -351,15 +351,15 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Είστε σίγουροι ότι θέλετε να επαναφορτώσετε '%s';" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Μετάβαση στη Γραμμή" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Εισάγετε τη γραμμή που θέλετε να μεταφερθείτε:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 #, fuzzy msgid "" "Please set the filetype for the current file before using this function." @@ -367,39 +367,39 @@ "Παρακαλώ καθορίστε τον τύπο αρχείου για το τρέχον αρχείο πριν τη χρήση αυτής " "της συνάρτησης." -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "Χρησιμοποιείστε Προσαρμοσμένη Διάταξη Ημερομηνίας" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Προσαρμοσμένη Διάταξη Ημερομηνίας" -#: ../src/callbacks.c:1495 +#: ../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." @@ -408,26 +408,26 @@ "χρησιμοποιήσετε οποιαδήποτε μετατροπή προσδιορισμού που μπορεί να " "χρησιμοποιηθεί με τη ANSI C strftime συνάρτηση." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Η μορφή της ημερομηνίας δεν ήταν δυνατόν να μετατραπεί (πιθανόν λόγω μεγάλου " "μήκους)." -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Δεν υπάρχουν άλλα στοιχεία μηνυμάτων." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Άνοιγμα Αρχείου" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Προβολή" -#: ../src/dialogs.c:150 +#: ../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." @@ -435,29 +435,29 @@ "Ανοίγει το αρχείο μόνο για ανάγνωση. Αν επιλέξετε περισσότερα από ένα αρχεία " "για άνοιγμα, όλα τα αρχεία θα ανοιχτούν μόνο για ανάγνωση." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Ανίχνευση από την επέκταση αρχείου" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Ανίχνευση από το αρχείο" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "Επιλογές" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Εμφάνιση _κρυφών αρχείων" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Καθορισμός κωδικοποίησης:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -472,11 +472,11 @@ "επιλεγμένη κωδικοποίηση." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Καθορισμός τύπου αρχείου:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -488,24 +488,32 @@ "Σημειώστε ότι εάν επιλέξετε πολλαπλά αρχεία, θα ανοιχτούν όλα με τον " "επιλεγμένο τύπο αρχείου." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Αποθήκευση Αρχείου" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Μ_ετονομασία" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 #, fuzzy msgid "Save the file and rename it" msgstr "Αποθήκευση και μετονομασία αρχείου." -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Άνοιγμα αρχείου σε νέα ετικέτα" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -514,24 +522,41 @@ "Κρατήστε το τρέχον μη αποθηκευμένο κείμενο ανοιχτό και ανοίξτε το πρόσφατα " "αποθηκευμένο αρχείο σε νέα ετικέτα." -#: ../src/dialogs.c:622 +#: ../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 "_Απόρριψη" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Το αρχείο '%s' δεν αποθηκεύτηκε." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Θέλετε να κάνετε αποθήκευση προτού το κλείσετε;" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Επιλογή γραμματοσειράς" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -539,106 +564,106 @@ "Παρουσιάστηκε ένα σφάλμα ή οι πληροφορίες του αρχείου δεν μπόρεσαν να " "ανακτηθούν (π.χ. από ένα νέο αρχείο)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "άγνωστο" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Ιδιότητες" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Τύπος:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Μέγεθος:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Τοποθεσία:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Μόνο για ανάγνωση:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(μόνο εντός Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Κωδικοποίηση:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(με BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(χωρίς BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Τροποποιημένο:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Μεταβλήθηκε:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Προσπελάστηκε:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Δικαιώματα" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Ανάγνωση:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Εγγραφή:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Κάτοχος:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Ομάδα:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Άλλοι:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Το αρχείο %s έκλεισε." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Ανοίχθηκε νέο αρχείο \"%s\"." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Δεν ήταν δυνατόν το άνοιγμα αρχείου %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -654,12 +679,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Το αρχείο \"%s\" δεν είναι έγκυρο %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -668,50 +693,53 @@ "Το αρχείο \"%s\" δεν φαίνεται να είναι αρχείο κειμένου ή δεν υποστηρίζεται η " "κωδικοποίηση του αρχείου." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Κενά" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Ετικέτες" -#: ../src/document.c:1174 +#: ../src/document.c:1128 #, 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:1179 +#: ../src/document.c:1133 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Ρύθμιση %s μεθόδου εσοχής" -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Λάθος όνομα αρχείου" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Το αρχείο %s επαναφορτώθηκε." -#: ../src/document.c:1354 +#. 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 "Το αρχείο %s ανοίχθηκε(%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", μόνο για ανάγνωση" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "Σφάλμα στην αποθήκευση αρχείου." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -720,7 +748,7 @@ "Παρουσιάστηκε σφάλμα κατά την μετατροπή του αρχείου από UTF-8 σε \"%s\". Το " "αρχείο παραμένει μη αποθηκευμένο." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -729,52 +757,52 @@ "Μήνυμα σφάλματος: %s\n" "Το σφάλμα παρουσιάστηκε στο \"%s\" (γραμμή: %d, στήλη: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Μήνυμα σφάλματος: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Σφάλμα στην αποθήκευση αρχείου." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Σφάλμα αποθήκευσης αρχείου (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Το αρχείο %s αποθηκεύτηκε." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" δεν βρέθηκε." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Ολοκλήρωση αναζήτησης και εύρεση ξανά;" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Δεν βρέθηκαν αποτελέσματα για \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../src/document.c:2022 ../src/document.c:2031 #, 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:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Θέλετε να το επαναφορτώσετε;" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -783,33 +811,21 @@ "Το αρχείο '%s' στον δίσκο είναι πιο πρόσφατο από\n" "του τρέχοντος buffer." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, fuzzy, c-format msgid "File \"%s\" was not found on disk!" msgstr "\"%s\" δεν βρέθηκε." -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 #, fuzzy msgid "Enter Tab Width" msgstr "Πλάτος του Tab:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" @@ -910,134 +926,123 @@ msgstr "Κινέζικη Παραδοσιακή" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Ιαπωνική" -#: ../src/encodings.c:141 ../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 "Κορεάτικη" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Χωρίς κωδικοποίηση" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Δυτικής Ευρώπης" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Ανατολικής Ευρώπης" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Ανατολικής Α_σίας" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_ΝΑ & ΝΔ Ασίας" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Μέσης Ανατολής" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Κανένα" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Πηγαίο αρχείο %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "Πηγαίο αρχείο %s" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Κανένα" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Αρχείο Shell script" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Αρχείο δημιουργίας" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Έγγραφο XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL Dump αρχείο" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Αρχείο Diff" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Αρχείο Config" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 #, fuzzy msgid "Gettext translation file" msgstr "υπεύθυνος μετάφρασης" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, fuzzy, c-format msgid "%s script file" msgstr "Αρχείο Shell script" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Αρχείο reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "_Γλώσσες Προγραμματισμού" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Γλώσσες _Scripting" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Γλώσσες _Markup" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "_Διάφορες Γλώσσες" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Όλα τα Πηγαία" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Όλα τα αρχεία" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "χωρίς όνομα" @@ -1051,8 +1056,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "αόρατο" @@ -1060,7 +1065,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Άνοιγμα _Επιλεγμένου Αρχείου" @@ -1081,12 +1086,12 @@ msgid "Page Set_up" msgstr "Ρύθμιση σελίδας" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 #, fuzzy msgid "Close Ot_her Documents" msgstr "Κλείσιμο του τρέχοντος αρχείου" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "_Κλείσιμο Όλων" @@ -1094,90 +1099,86 @@ msgid "_Edit" msgstr "Επε_ξεργασία" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Επιλο_γή Όλων" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Διαμόρφωση" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Ενα_λλαγή Πεζών/Κεφαλαίων των Επιλεγμένων" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Σχολιασμός της/των Γραμμής(ών)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Α-ποσχολιασμός της/των Γραμμής(ών)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Ενεργοποίηση/απενεργοποίηση Γραμμής _Σχολιασμού" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "Αντίγραφο της Γραμμής ή της Επιλογής" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Αύξηση Εσο_χής" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "_Μείωση Εσοχής" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "Απ_οστολή Επιλογής προς" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "Απ_οστολή Επιλογής προς" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Εισαγωγή Σχολί_ων" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Εισαγωγή ChangeLog καταχώρησης" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 #, fuzzy msgid "Insert File _Header" msgstr "Εισαγωγή Επικεφαλίδας Αρχείου" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 #, fuzzy msgid "Insert _Function Description" msgstr "Εισαγωγή Περιγραφής της Συνάρτησης" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Εισαγωγή Σχολίου Πολλαπλών Γραμμών" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 #, fuzzy msgid "Insert _GPL Notice" msgstr "Εισαγωγή GPL Σημειώματος" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 #, fuzzy msgid "Insert _BSD License Notice" msgstr "Εισαγωγή Σημειώματος BSD Άδειας" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Εισαγωγή _Ημερομηνίας" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Εισαγωγή \"include <...>\"" @@ -1202,7 +1203,7 @@ msgid "Find in F_iles" msgstr "Αναζήτηση στα Α_ρχεία" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Αν_τικατάσταση" @@ -1224,7 +1225,7 @@ msgid "Pr_evious Message" msgstr "Επόμενο Μήνυμα" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Πήγαιν_ε στη Γραμμή" @@ -1253,7 +1254,7 @@ msgid "Show Side_bar" msgstr "Εμφάνιση Πλε_υρικής Μπάρας" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Επεξεργαστής" @@ -1301,17 +1302,17 @@ msgid "In_dent Type" msgstr "Τύπος Εσοχής" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 #, fuzzy msgid "_Tabs" msgstr "Ετικέτες" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 #, fuzzy msgid "_Spaces" msgstr "Κενά" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 #, fuzzy msgid "T_abs and Spaces" msgstr "_Αντικατάσταση των Tab σε Κενά" @@ -1435,7 +1436,7 @@ msgid "_Debug Messages" msgstr "Μηνύματα" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Σύμβολα" @@ -1459,83 +1460,88 @@ msgid "Scribble" msgstr "Σημειωματάριο" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 #, fuzzy msgid "Images _and Text" msgstr "Εικόνες και κείμενο" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 #, fuzzy msgid "_Images Only" msgstr "Μόνο εικόνες" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 #, fuzzy msgid "_Text Only" msgstr "Μόνο κείμενο" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 #, fuzzy msgid "_Large Icons" msgstr "Μεγάλα εικονίδια" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 #, fuzzy msgid "_Small Icons" msgstr "Μικρά εικονίδια" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "Μικρά εικονίδια" -#: ../src/interface.c:1770 +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" +msgstr "Απόκρυψη μπάρας εργαλείων" + +#: ../src/interface.c:1777 #, fuzzy -msgid "_Hide toolbar" +msgid "_Hide Toolbar" msgstr "Απόκρυψη μπάρας εργαλείων" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 #, fuzzy msgid "Find _Usage" msgstr "Εύρεση Χρήσης" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 #, fuzzy msgid "Find _Document Usage" msgstr "Εύρεση Χρήσης" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 #, fuzzy msgid "Go to _Tag Definition" msgstr "Πήγαινε στον Ορισμό Ετικετών" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 #, fuzzy msgid "Go to T_ag Declaration" msgstr "Πήγαινε στη Δήλωση Ετικετών" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 #, fuzzy msgid "Conte_xt Action" msgstr "Δράση Πλαισίου" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Ιδιότητες" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Φόρτωσε τα αρχεία από την τελευταία συνεδρία" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Ανοίγει κατά την εκκίνηση τα αρχεία από την τελευταία συνεδρία" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Φόρτωση υποστήριξης virtual terminal" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1544,42 +1550,42 @@ "Εάν και κατά πόσο το virtual terminal emulation (VTE) πρέπει να φορτώνεται " "κατά την εκκίνηση. Απενεργοποιήστε το εάν δεν το χρειάζεστε." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Ενεργοποίηση υποστήριξης επιπρόσθετων" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Εκκίνηση" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Αποθήκευση της θέσης και γεωμετρίας του παραθύρου" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Αποθηκεύει την θέση και γεωμετρία του παραθύρου και τα επαναφέρει κατά την " "εκκίνηση" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Επιβεβαίωση κατά την έξοδο" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Εμφανίζει έναν διάλογο επιβεβαίωσης κατά την έξοδο." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Τερματισμός" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Διαδρομή εκκίνησης:" -#: ../src/interface.c:2758 +#: ../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." @@ -1588,40 +1594,40 @@ "Πρέπει να είναι απόλυτη διαδρομή. Αφήστε το κενό για χρήση του τρέχοντος " "φακέλου εργασίας." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Αρχεία έργου:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Η διαδρομή από την οποία θα ξεκινά για άνοιγμα των αρχείων του έργου" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 #, fuzzy msgid "Extra plugin path:" msgstr "Ενεργοποίηση υποστήριξης επιπρόσθετων" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Διαδρομές" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 #, fuzzy msgid "Startup" msgstr "Κατάσταση" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Ηχητικό σήμα σε σφάλματα ή όταν έχει ολοκληρωθεί το compilation" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1630,11 +1636,11 @@ "Εάν θα ακούγεται ηχητικό σήμα στην εμφάνιση λάθους ή όταν η διαδικασία του " "compilation έχει ολοκληρωθεί." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Μετάβαση στη λίστα κατάστασης μηνυμάτων όταν υπάρχει νέο μήνυμα" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1643,12 +1649,12 @@ "Μετάβαση στην ετικέτα κατάστασης μηνυμάτων (κάτω μέρος στο παράθυρο του " "σημειωματαρίου) όταν ένα νέο μήνυμα κατάστασης εμφανιστεί." -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "" "Απόκρυψη των μηνυμάτων της κατάστασης λειτουργίας από την γραμμή κατάστασης" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1656,11 +1662,12 @@ "Αφαιρεί όλα τα μηνύματα από την γραμμή κατάστασης. Τα μηνύματα θα συνεχίζουν " "να εμφανίζονται στο παράθυρο μηνυμάτων κατάστασης λειτουργίας." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Widget αυτόματης εστίασης (η εστίαση ακολουθεί το ποντίκι)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1670,17 +1677,17 @@ "Λειτουργεί με τα widget τηςκύριας σύνταξης, τις σημειώσεις, την μπάρα " "εργαλείων, τη γραμμή πήγαινε και το VTE." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Διάφορα" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "" "Να γίνεται πάντα αναδίπλωση της αναζήτησης και απόκρυψη του διαλόγου " "αναζήτησης" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1689,31 +1696,31 @@ "Να γίνεται πάντα αναδίπλωση της αναζήτησης γύρω από το κείμενο και απόκρυψη " "του διαλόγου αναζήτησης μετά από κλικ στο Εύρεση Επόμενο/Προηγούμενο" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2896 +#: ../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:2898 +#: ../src/interface.c:2918 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Ο φάκελος για αναζήτηση σε αρχεία δεν υπάρχει." -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 #, fuzzy msgid "Search" msgstr "Πλευρική μπάρα" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Χρήση αρχείων συνεδρίας βασισμένα στο έργο" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " @@ -1722,12 +1729,12 @@ "Εάν θα αποθηκεύει τα αρχεία της συνεδρίας ενός έργου και θα τα ανοίγει όταν " "θα ξανανοίγει το έργο." -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 #, fuzzy msgid "Store project file inside the project base directory" msgstr "Δημιουργία φακέλλου της βασικής διαδρομής του έργου;" -#: ../src/interface.c:2929 +#: ../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 " @@ -1735,76 +1742,76 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Έργα" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 #, fuzzy msgid "Miscellaneous" msgstr "Διάφορα" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Γενικά" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Εμφάνιση λίστας συμβόλων" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Ενεργοποίηση/απενεργοποίηση της λίστας των συμβόλων" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Εμφάνιση λίστας εγγράφων" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Ενεργοποίηση/απενεργοποίηση της λίστας των εγγράφων" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Πλευρική μπάρα" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Λίστα συμβόλων:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Παράθυρο μηνυμάτων:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Επεξεργαστής:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Καθορίζει τη γραμματοσειρά για το παράθυρο μηνυμάτων" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Καθορίζει τη γραμματοσειρά για τη λίστα των συμβόλων" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Καθορίζει τη γραμματοσειρά για τον επεξεργαστή" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Γραμματοσειρές" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Εμφάνιση των ετικετών του επεξεργαστή" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Εμφάνιση κουμπιών τερματισμού" -#: ../src/interface.c:3064 +#: ../src/interface.c:3084 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1814,111 +1821,116 @@ "κλείσιμο των αρχείων όταν θα γίνεται κλικ πάνω σ' αυτό (απαιτεί επανεκκίνηση " "του Geany)." -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Τοποθέτηση των νέων ετικετών αρχείων:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Αριστερά" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "Οι ετικέτες αρχείων θα τοποθετούνται στα αριστερά του σημειωματάριου" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Δεξιά" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "Οι ετικέτες αρχείων θα τοποθετούνται στα δεξιά του σημειωματάριου" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Ενεργοποίηση όλων των επιπρόσθετων Widgets" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Ενεργοποίηση όλων των επιπρόσθετων Widgets" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Ετικέτες επεξεργαστή" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Κορυφή" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Κάτω μέρος" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Πλευρική μπάρα:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Θέσεις ετικέτας" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Εμφάνιση γραμμής κατάστασης" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "" "Κατά πόσο θα εμφανίζεται η γραμμή κατάστασης στο κάτω μέρος του κεντρικού " "παραθύρου" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Περιβάλλον εργασίας" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "Εμφάνιση μπάρας εργαλείων" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Μπάρα εργαλείων" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Ύφος εικονιδίων:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Μέγεθος εικονιδίων:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Εμφάνιση" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Εμφάνιση _Μπάρας Εργαλείων" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Μπάρα εργαλείων" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Αναδίπλωση Γραμμής" -#: ../src/interface.c:3349 +#: ../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 " @@ -1928,11 +1940,11 @@ "επόμενη γραμμή. Σημείωση: η αναδίπλωση γραμμής έχει υψηλό κόστος απόδοσης σε " "μεγάλα έγγραφα άρα θα πρέπει να απενεργοποιείται σε αργά μηχανήματα." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Ενεργοποίηση \"smart\" πλήκτρου αρχικού καταλόγου" -#: ../src/interface.c:3354 +#: ../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 " @@ -1947,11 +1959,11 @@ "παράλειψης στην αρχή της τρέχουσας γραμμής, ανεξάρτητα από τη τρέχουσα θέση " "του." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Απενεργοποίηση του Drag και Drop" -#: ../src/interface.c:3359 +#: ../src/interface.c:3403 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1961,20 +1973,20 @@ "έτσι δεν μπορείτε να κάνετε drag και drop οποιεσδήποτε επιλογές μέσα ή έξω " "από το παράθυρο του επεξεργαστή." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Ενεργοποίηση δίπλωσης" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Εάν θα ενεργοποιείται η δίπλωση του κώδικα" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Δίπλωση/Αναδίπλωση όλων των παράγωγων ενός σημείου δίπλωσης" -#: ../src/interface.c:3369 +#: ../src/interface.c:3413 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1984,11 +1996,11 @@ "πλήκτρο Shift ενώ κάνετε κλικ σε ένα σύμβολο δίπλωσης θα εκτελεστεί η " "αντίθετη συμπεριφορά της ενέργειας αυτής." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Χρήση δεικτών για την εμφάνιση σφαλμάτων του μεταγλωτιστή" -#: ../src/interface.c:3374 +#: ../src/interface.c:3418 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1997,95 +2009,95 @@ "Εάν θα χρησιμοποιούνται δείκτες (μια καμπυλωτή υπογράμμιση) για να εστιάζουν " "στις γραμμές που ο μεταγλωτιστής βρήκε μια προειδοποίηση ή ένα σφάλμα." -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 #, fuzzy msgid "Newline strips trailing spaces" msgstr "Διαγραφή λωρίδων κενών από το newline" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Ενεργοποιεί το newline να διαγράφει τις λωρίδες κενών από την προηγούμενη " "γραμμή." -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 #, fuzzy msgid "Comment toggle marker:" msgstr "Ενεργοποίηση/απενεργοποίηση δείκτη" -#: ../src/interface.c:3406 +#: ../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 "" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Χαρακτηριστικά" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 #, fuzzy msgid "Features" msgstr "Χαρακτηριστικά" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Μέθοδος αυτόματης εσοχής:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Βασικό" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Τρέχον χαρακτήρες" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Τύπος:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 #, fuzzy msgid "Width:" msgstr "Εγγραφή:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 #, fuzzy msgid "The width in chars of a single indent" msgstr "Το πλάτος σε χαρακτήρες, τους οποίους θα έχει ένας χαρακτήρας tab" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 #, fuzzy msgid "Hard tab width:" msgstr "Πλάτος του Tab:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " @@ -2094,30 +2106,30 @@ "Εάν θα ανιχνεύεται ο τύπος της εσοχής από τα περιεχόμενα του αρχείου όταν " "ένα αρχείο θα είναι ανοιχτό." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 #, fuzzy msgid "Tab key indents" msgstr "Έξυπνη εσοχή γραμμής" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Εσοχή" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 #, fuzzy msgid "Indentation" msgstr "Εσοχή" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Ολοκλήρωση αποκομάτων" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 #, fuzzy msgid "" "Type a defined short character sequence and complete it to a more complex " @@ -2126,32 +2138,32 @@ "Πληκτρολογήστε μια καθορισμένη σύντομη ακολουθία χαρακτήρων και ολοκληρώστε " "τη σε μια πιό σύνθετη σειρά χαρακτήρων χρησιμοποιώντας ένα πάτημα πλήκτρου." -#: ../src/interface.c:3583 +#: ../src/interface.c:3627 #, fuzzy -msgid "XML tag auto completion" +msgid "XML tag autocompletion" msgstr "Αυτόματη ολοκλήρωση XML ετικετών" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Αυτόματη ολοκλήρωση και κλείσιμο των XML ετικετών (συμπεριλαμβάνει HTML " "ετικέτες)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3591 +#: ../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 "" -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "Αυτόματη ολοκλήρωση συμβόλων" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2159,145 +2171,154 @@ "Αυτόματη ολοκλήρωση των γνωστών συμβόλων σε ανοιγμένα αρχεία (ονόματα " "συναρτήσεων, γενικές μεταβλητές, ...)" -#: ../src/interface.c:3604 +#: ../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 "" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Χαρακτήρες προς τύπωση για ολοκλήρωση:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 #, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" "Το πλήθος των χαρακτήρων που είναι απαραίτητα για να εμφανίσουν τη λίστα " "αυτόματηςολοκλήρωσης συμβόλων." -#: ../src/interface.c:3640 +#: ../src/interface.c:3692 #, fuzzy -msgid "Display height in rows for the auto completion list" +msgid "Display height in rows for the autocompletion list" msgstr "Αριθμός των σειρών που θα εμφανίζει η λίστα αυτόματης ολοκλήρωσης." -#: ../src/interface.c:3649 +#: ../src/interface.c:3701 #, fuzzy -msgid "Maximum number of entries to display in the auto completion list" +msgid "Maximum number of entries to display in the autocompletion list" msgstr "Αριθμός των σειρών που θα εμφανίζει η λίστα αυτόματης ολοκλήρωσης." -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Ολοκληρώσεις" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 #, fuzzy msgid "Completions" msgstr "Ολοκληρώσεις" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Αντιστροφή των χρωμάτων υπογράμμισηςτου συντάκτη" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Εμφάνιση οδηγών εσοχής" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Εμφανίζει μικρές γραμμές με κουκκίδες για να σας βοηθήσει να χρησιμοποιείτε " "τη σωστή εσοχής." -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Εμφάνιση των κενών" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Μαρκάρει τα κενά με τελείες και τα tab με βελάκια." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Εμφάνιση τέλους γραμμής" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "Εμφανίζει τον χαρακτήρα τέλους γραμμής" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 #, fuzzy msgid "Show line numbers" msgstr "Εμφάνιση Μ_ετρητή Γραμμών" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Εμφανίζει ή κρύβει τον δείκτη του Μετρητή Γραμμών." -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 #, fuzzy msgid "Show markers margin" msgstr "Εμφάνιση _Δεικτών Περιθωρίου" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2306,37 +2327,37 @@ "Εμφανίζει ή κρύβει τα μικρά περιθώρια δεξιά από τους αριθμούς των γραμμών, " "που χρησιμοποιούνται ως δείκτες των γραμμών." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 #, fuzzy msgid "Stop scrolling at last line" msgstr "Κύλιση στη τρέχουσα γραμμή" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Εμφάνιση" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Μεγάλος δείκτης γραμμής:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Χρώμα μεγάλου δείκτη γραμμής:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Καθορίζει το χρώμα του μεγάλου δείκτη γραμμής" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Επιλογέας Χρώματος" -#: ../src/interface.c:3826 +#: ../src/interface.c:3878 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2348,11 +2369,11 @@ "σπάσιμο της γραμμής. Θέστε τη τιμή μεγαλύτερη του 0 για να καθορίσετε που θα " "εμφανίζεται η στήλη." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Γραμμή" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2361,11 +2382,11 @@ "Τυπώνει μια κάθετη γραμμή στο παράθυρο του επεξεργαστή κειμένου στη δοθείσα " "θέση του κέρσορα (δείτε παρακάτω)." -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Φόντο" -#: ../src/interface.c:3846 +#: ../src/interface.c:3898 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2376,60 +2397,60 @@ "παρακάτω) άλλαξε στο παρακάτω καθορισμένο χρώμα. ( Προτείνεται εάν " "χρησιμοποιείτε ανάλογες γραμματοσειρές)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Απενεργοποιημένο" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Μεγάλος δείκτης γραμμής" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Εμφάνιση" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 #, fuzzy msgid "Default end of line characters:" msgstr "Προκαθορισμένη κωδικοποίηση (νέα αρχεία):" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Νέα αρχεία" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 #, fuzzy msgid "Sets the default encoding for newly created files" msgstr "" "Θέτει την προκαθορισμένη κωδικοποίηση για τα πρόσφατα δημιουργημένα αρχεία." -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Προκαθορισμένη κωδικοποίηση (νέα αρχεία):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr " προκαθορισμένη κωδικοποίηση (υπάρχοντα αρχεία):" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "" "Θέτει τη προκαθορισμένη κωδικοποίηση για το άνοιγμα των υπαρχόντων αρχείων." -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Χρήση σταθερής κωδικοποίησης κατά το άνοιγμα αρχείων" -#: ../src/interface.c:3978 +#: ../src/interface.c:4030 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " @@ -2440,84 +2461,84 @@ "αρχείου κατά το άνοιγμα των αρχείων και ανοίγει το αρχείο με την " "προσδιορισμένη κωδικοποίηση (συνήθως δεν χρειάζεται)." -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 #, fuzzy msgid "Encodings" msgstr "Κωδικοποίηση:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 #, fuzzy msgid "Ensure new line at file end" msgstr "Σιγούρευση για new line στο τέλος του αρχείου" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 #, fuzzy msgid "Ensures that at the end of the file is a new line" msgstr "Σιγουρεύει ότι υπάρχει στο τέλος του αρχείου το new line" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Διαγραφή λωρίδων κενών" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Διαγράφει τις λωρίδες των κενών και των tab στο τέλος των γραμμών" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Αντικατάσταση των tab με κενά" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Αντικαθιστά όλα τα tab σε κενά." -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Αποθήκευση αρχείων" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Μέγεθος λίστας Πρόσφατα αρχεία:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" "Καθορίζει τον αριθμό των αρχείων που αποθηκεύονται στη λίστα Πρόσφατα αρχεία." -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Αρχεία" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Δημιουργία:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Τερματικό:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Φυλλομετρητής:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Διαδρομή και επιλογές για το εργαλείο δημιουργίας" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2525,25 +2546,25 @@ "Ένας προσομοιωτής τερματικού όπως το xterm, gnome-terminal, ή κονσόλα (θα " "πρέπει να δέχεται το επιχείρημα -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Διαδρομή (και πιθανά επιπρόσθετα επιχειρήματα) του αγαπημένου σας " "φυλλομετρητή" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Διαδρομές εργαλείων" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Δράση πλαισίου:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2554,69 +2575,69 @@ "με %s. Μπορεί να εμφανιστεί οπουδήποτε στη δοθείσα εντολή και θα " "αντικαθιστάται πριν την εκτέλεση." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Εντολές" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Εργαλεία" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "διεύθυνση email του δημιουργού" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Αρχικά του ονόματος του δημιουργού" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Αρχική έκδοση:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Αριθμό έκδοσης, τον οποίο αρχικά έχει ένα νέο αρχείο" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Όνομα εταιρίας" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Δημιουργός:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Εταιρία:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Διεύθυνση mail:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Αρχικά:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Το όνομα του δημιουργού" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 #, fuzzy msgid "Year:" msgstr "Πλευρική μπάρα:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 #, fuzzy msgid "Date:" msgstr "Δημιουργία:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4382 +#: ../src/interface.c:4434 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2627,7 +2648,7 @@ "οποιουσδήποτε προσδιοριστές μετατροπής που μπορούν να χρησιμοποιηθούν με την " "ANSI C strftime συνάρτηση." -#: ../src/interface.c:4389 +#: ../src/interface.c:4441 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2638,7 +2659,7 @@ "οποιουσδήποτε προσδιοριστές μετατροπής που μπορούν να χρησιμοποιηθούν με την " "ANSI C strftime συνάρτηση." -#: ../src/interface.c:4396 +#: ../src/interface.c:4448 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2649,55 +2670,55 @@ "οποιουσδήποτε προσδιοριστές μετατροπής που μπορούν να χρησιμοποιηθούν με την " "ANSI C strftime συνάρτηση." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Δεδομένα πρότυπου" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Πρότυπα" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "Α_λλαγή" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Συντομεύσεις πλήκτων" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Συνδυασμοί πλήκτων" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Εντολή:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Διαδρομή της εντολής εκτύπωσης αρχείων (χρησιμοποιείστε %f για το όνομα " "αρχείου)." -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Χρησιμοποιείστε μια εξωτερική εντολή για εκτύπωση" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Εκτύπωση αριθμών γραμμών" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Προσθέτει αριθμούς γραμμών στην εκτυπωμένη σελίδα." -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Εκτύπωση αριθμών σελίδας" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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." @@ -2705,11 +2726,11 @@ "Προσθέτει αριθμούς σελίδας στο τέλος της κάθε σελίδας. Καταλαμβάνει 2 " "γραμμές από τη σελίδα." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Εκτύπωση κεφαλής σελίδας" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../src/interface.c:4575 ../src/printing.c:392 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2719,21 +2740,21 @@ "το όνομα αρχείου και την τρέχουσα ημερομηνία (δείτε παρακάτω). Καταλαμβάνει " "3 γραμμές από τη σελίδα." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Χρήση του βασικού ονόματος του εκτυπώμενου αρχείου" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "" "Εκτυπώνει μόνο το βασικό όνομα (χωρίς τη διαδρομή) του εκτυπώμενου αρχείου." -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Μορφή ημερομηνίας:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2744,568 +2765,587 @@ "οποιουσδήποτε προσδιοριστές μετατροπής που μπορούν να χρησιμοποιηθούν με την " "ANSI C strftime συνάρτηση." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Χρήση εγγενής εκτύπωσης GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Γίνεται η Εκτύπωση" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Ιδιότητες Έργου" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Αρχείο" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Νέο" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Άνοιγμα" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Άνοιγμα του επιλεγμένου αρχείου" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Αποθήκευση" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Αποθήκευση ως" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Αποθήκευση όλων" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Εκτύπωση" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Κλείσιμο" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Κλείσιμο όλων" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Επαναφόρτωση αρχείου" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 #, fuzzy msgid "Project" msgstr "Έρ_γο" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Ιδιότητες έργου" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Αναίρεση" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Επανάληψη" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Διπλασιασμός γραμμής ή επιλογής" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Διαγραφή τρέχον γραμμής(ών)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "Διαγραφή τρέχον γραμμής(ών)" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "Μετάθεση τρέχουσας γραμμής" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Κύλιση στη τρέχουσα γραμμή" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Κύλιση πάνω κατά μια γραμμή" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Κύλιση κάτω κατά μια γραμμή" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 #, fuzzy msgid "Complete snippet" msgstr "Πλήρες απόκομα" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Δράση Πλαισίου" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Πλήρης λέξη" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 #, fuzzy msgid "Show calltip" msgstr "Εμφάνιση calltip" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Εμφάνιση λίστας μακροεντολών" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Αποκοπή" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Αντιγραφή" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Επικόλληση" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Αντιγραφή τρέχον γραμμής(ών)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Αποκοπή τρέχον γραμμής(ών)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 #, fuzzy msgid "Select" msgstr "Επιλογή Όλων" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Επιλογή Όλων" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Επιλογή τρέχουσας λέξης" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Επιλογή τρέχον γραμμής(ών)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Επιλογή τρέχουσας παραγράφου" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 #, fuzzy msgid "Format" msgstr "_Διαμόρφωση" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 #, fuzzy msgid "Toggle Case of Selection" msgstr "Εναλλαγή πεζών/κεφαλαίων των επιλεγμένων" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Ενεργοποίηση/απενεργοποίηση σχολίων γραμμής" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Σχολιασμός γραμμής(ών)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Αποσχολιασμός γραμμής(ών)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Αύξηση εσοχής" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Μείωση εσοχής" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Αύξηση εσοχής κατά ένα κενό" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Μείωση εσοχής κατά ένα κενό" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Έξυπνη εσοχή γραμμής" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Αποστολή στη Προσαρμοσμένη Εντολή 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Αποστολή στη Προσαρμοσμένη Εντολή 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Αποστολή στη Προσαρμοσμένη Εντολή 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "Απ_οστολή Επιλογής προς" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 #, fuzzy msgid "Insert" msgstr "_Εισαγωγή" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Εισαγωγή ημερομηνίας" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 #, fuzzy msgid "Insert alternative white space" msgstr "Εισαγωγή εναλλακτικού whitespace" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 #, fuzzy msgid "Settings" msgstr "Ενότητες" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 #, fuzzy msgid "Search" msgstr "_Αναζήτηση" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Εύρεση" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Εύρεση Επόμενου" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Εύρεση Προηγούμενου" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Εύρεση Επόμενων Επιλεγμένων" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Εύρεση Προηγούμενων Επιλεγμένων" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Αντικατάσταση" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Εύρεση σε Αρχεία" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Επόμενο Μήνυμα" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 #, fuzzy msgid "Previous Message" msgstr "Επόμενο Μήνυμα" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Εύρεση Χρήσης" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 #, fuzzy msgid "Find Document Usage" msgstr "Εύρεση Χρήσης" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Δημιουργία _Όλων" + +#: ../src/keybindings.c:369 #, fuzzy msgid "Go to" msgstr "Μετάβαση στη Γραμμή" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Πλοήγηση μια θέση πίσω" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Πλοήγηση μια θέση μπρος" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Ενεργοποίηση/απενεργοποίηση δείκτη" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Πήγαινε στον επόμενο δείκτη" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Πήγαινε στον προηγούμενο δείκτη" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Πήγαινε στον Ορισμό Ετικετών" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Πήγαινε στη Δήλωση Ετικετών" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 #, fuzzy msgid "Go to Start of Line" msgstr "Μετάβαση στη Γραμμή" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 #, fuzzy msgid "Go to End of Line" msgstr "Μετάβαση στη Γραμμή" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Μετάβαση στη Γραμμή" + +#: ../src/keybindings.c:400 #, fuzzy msgid "Go to Previous Word Part" msgstr "Πήγαινε στον προηγούμενο δείκτη" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 #, fuzzy msgid "Go to Next Word Part" msgstr "Πήγαινε στον επόμενο δείκτη" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 #, fuzzy msgid "View" msgstr "_Προβολή" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Ενεργοποίηση όλων των επιπρόσθετων Widgets" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Πλήρης Οθόνη" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Ενεργοποίηση Παράθυρου Μηνυμάτων" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Ενεργοποίηση Πλευρικής Μπάρας" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Μεγέθυνση" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Σμίκρυνση" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Μετάβαση στον Επεξεργαστή" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Μετάβαση στο Σημειωματάριο" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Μετάβαση στο VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Μετάβαση στη Μπάρα Αναζήτησης" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 #, fuzzy msgid "Switch to Sidebar" msgstr "Μετάβαση στη Μπάρα Αναζήτησης" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 #, fuzzy msgid "Switch to Compiler" msgstr "Μετάβαση στη Μπάρα Αναζήτησης" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 #, fuzzy msgid "Notebook tab" msgstr "Εντολές ετικετών σημειωματάριου" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Μετάβαση στο αριστερό έγγραφο" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Μετάβαση στο δεξί έγγραφο" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Μετάβαση στο τελευταία χρησιμοποιημένο έγγραφο" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Μετακίνηση εγγράφου αριστερά" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Μετακίνηση εγγράφου δεξιά" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Μετακίνηση εγγράφου ως πρώτο" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Μετακίνηση εγγράφου ως τελευταίο" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 #, fuzzy msgid "Document" msgstr "Έγγ_ραφο" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 #, fuzzy msgid "Toggle Line wrapping" msgstr "Αναδίπλωση Γραμμής" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 #, fuzzy msgid "Toggle Line breaking" msgstr "Ενεργοποίηση/απενεργοποίηση Γραμμής _Σχολιασμού" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 #, fuzzy msgid "Replace spaces by tabs" msgstr "_Αντικατάσταση των Tab σε Κενά" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 #, fuzzy msgid "Toggle current fold" msgstr "Επιλογή τρέχουσας λέξης" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Δίπλωση όλων" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Αναδίπλωση όλων" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Επαναφόρτωση λίστας συμβόλων" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 #, fuzzy msgid "Build" msgstr "Δημιουργία" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Μεταγλώτιση" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Δημιουργία όλων" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Δημιουργία Προσαρμοσμένου Προορισμού" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Δημιουργία αντικειμένου" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Επόμενο σφάλμα" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 #, fuzzy msgid "Previous error" msgstr "Προηγούμενοι Μεταφραστές" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Εκτέλεση" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Εκτέλεση (εναλλακτική εντολή)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 #, fuzzy msgid "Build options" msgstr "Επιλογές δημιουργίας" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Εμφάνιση Επιλογέα Χρωμάτων" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Βοήθεια" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Συντομεύσεις Πληκτρολογίου" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Οι ακόλουθες συντομεύσεις πληκτρολογίου είναι διαμορφώσιμες:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 #, fuzzy msgid "Switch to Document" msgstr "Μετάβαση στο αριστερό έγγραφο" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Πληκτρολογείστε εδώ ότι θέλετε, χρησιμοποιείστε το ως ένα σημειωματάριο/" "πίνακα μηνυμάτων" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Αποτυχία φόρτωσης ενός ή περισσότερων αρχείων συνεδρίας." -#: ../src/log.c:177 +#: ../src/log.c:181 #, fuzzy msgid "Debug Messages" msgstr "Μηνύματα" @@ -3364,7 +3404,7 @@ msgstr "Εκτύπωση προθέματος εγκατάστασης του Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "να μην φορτώνονται να προηγούμενα αρχεία συνεδριών" #: ../src/main.c:143 @@ -3379,24 +3419,24 @@ msgid "Show version and exit" msgstr "Εμφάνιση έκδοσης και έξοδος" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3405,14 +3445,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3424,22 +3464,22 @@ "ρυθμίσεων.\n" "Να γίνει εκκίνηση του Geany;" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "Δεν ήταν δυνατόν να βρεθεί το αρχείο %s'." -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Αυτό είναι το Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 #, fuzzy msgid "Configuration files reloaded." msgstr "Αποτυχία μεταγλώτισης." @@ -3457,19 +3497,19 @@ msgid "_Hide Message Window" msgstr "_Απόκρυψη παράθυρου μηνυμάτων" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 #, fuzzy msgid "_Plugin Manager" msgstr "Διαχειριστής Επιπρόσθετων" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3480,23 +3520,23 @@ "Περιγραφή: %s\n" "Δημιουργός(οί): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Ενεργό" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Επιπρόσθετο" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Δεν υπάρχουν διαθέσιμα επιπρόσθετα." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Επιπρόσθετα" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3504,51 +3544,61 @@ "Παρακάτω υπάρχει ένας κατάλογος με τα διαθέσιμα επιπρόσθετα. Επιλέξτε τα " "επιπρόσθετα που πρέπει να φορτώνονται κατά την εκκίνηση του Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Λεπτομέρειες επιπρόσθετου:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Δράση" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Συντόμευση" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, fuzzy, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" "Δώστε τον συνδυασμό πλήκτρων που θέλετε να χρησιμοποιήσετε για το \"%s\"" -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +#, fuzzy +msgid "_Expand All" +msgstr "Εύρεση Όλ_ων" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +#, fuzzy +msgid "_Collapse All" +msgstr "_Κλείσιμο Όλων" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Δράση" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Συντόμευση" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Ο συνδυασμός '%s' χρησιμοποιείται ήδη για \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Εισάγετε παρακάτω τις διαδρομές των εργαλείων. Τα εργαλεία που δεν " "χρειάζονται μπορούν να παραμείνουν κενά." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3556,7 +3606,7 @@ "Καθορίστε τις πληροφορίες που θα χρησιμοποιούνται στα πρότυπα. Δείτε την " "τεκμηρίωση για λεπτομέρειες." -#: ../src/prefs.c:1458 +#: ../src/prefs.c:1523 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3567,7 +3617,7 @@ "επανεκκινήσετε το Geany για να πραγματοποιηθούν." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3579,7 +3629,7 @@ "απευθείας τη αντίστοιχη συντόμευση." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3588,61 +3638,62 @@ "δημιουργήθηκε υπό το GTK 2.10 (ή μεγαλύτερο) και το Geany τρέχει με " "GTK 2.10 (η μεγαλύτερο)." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -#: ../src/printing.c:270 +#: ../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 "Σελίδα %d από %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Ρύθμιση Εγγράφου" -#: ../src/printing.c:375 +#: ../src/printing.c:410 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "" "Εκτυπώνει μόνο το βασικό όνομα (χωρίς τη διαδρομή) του εκτυπώμενου αρχείου." -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Σελίδα %d από %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Η εκτύπωση του αρχείου %s ακυρώθηκε." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Το αρχείο %s εκτυπώθηκε." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Η εκτύπωση του %s απέτυχε (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "Παρακαλώ καθορίστε πρώτα μια εντολή εκτύπωσης στο διάλογο ιδιοτήτων" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3653,7 +3704,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Η εκτύπωση του \"%s\" απέτυχε (επιστροφή κωδικού: %s)." @@ -3672,19 +3723,19 @@ msgid "C_reate" msgstr "Δ_ημιουργία" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Όνομα:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Όνομα αρχείου:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Βασική διαδρομή:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3694,41 +3745,41 @@ "μια νέα διαδρομή, ή ένας υπάρχον φάκελος. Μπορείτε να χρησιμοποιήσετε " "διαδρομές σχετικές με το όνομα του έργου." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Επιλογή Βασικής Διαδρομής Έργου" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Το αρχείο έργου \"%s\" δεν ήταν δυνατόν να φορτωθεί." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Άνοιγμα Έργου" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Αρχεία Έργου" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Το έργο \"%s\" έκλεισε." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Περιγραφή:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Δημιουργία στη βασική διαδρομή" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Εκτέλεση εντολής:" -#: ../src/project.c:457 +#: ../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." @@ -3737,96 +3788,96 @@ "προστεθούν επιλογές στην εντολή. Αφήστε κενό για να χρησιμοποιήσετε την " "προκαθορισμένη εκτέλεση εντολής." -#: ../src/project.c:472 +#: ../src/project.c:476 #, fuzzy msgid "File patterns:" msgstr "Δομή Αρχείων:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Θέλετε να το κλείσετε πρίν προχωρήσετε;" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Το έργο '%s' είναι ήδη ανοιχτό." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Το καθορισμένο όνομα έργου είναι πολύ μικρό." -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Το καθορισμένο όνομα έργου είναι πολύ μεγάλο (max. %d χαρακτήρες)." -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Καθορίσατε ένα άκυρο όνομα αρχείου του έργου." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Δημιουργία φακέλλου της βασικής διαδρομής του έργου;" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Η διαδρομή \"%s\" δεν υπάρχει." -#: ../src/project.c:666 +#: ../src/project.c:670 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Το αρχείο του έργου δεν ήταν δυνατόν να γραφεί (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Το έργο \"%s\" δημιουργήθηκε." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Το έργο \"%s\" αποθηκεύτηκε." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Επιλογή Όνομα Αρχείου Έργου" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Επιλογή Εκτέλεσης Εντολής Έργου" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Το έργο \"%s\" άνοιξε." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "" -#: ../src/search.c:205 +#: ../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:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Αναζήτηση προς τα _πίσω" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Χρήση ακολουθιών _διαφυγής" -#: ../src/search.c:231 +#: ../src/search.c:246 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3835,409 +3886,419 @@ "Αντικατάσταση \\\\, \\t, \\n, \\r και \\uXXXX (Unicode χαρακτήρες) με τους " "αντίστοιχους χαρακτήρες ελέγχου." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Δ_ιάκριση κεφαλαίων/πεζών" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Ταίριασμα μόνο _ολόκληρης λέξης" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Ταίριασμα από την _αρχή της λέξης" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Προηγούμενο" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Επόμενο" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../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:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "Εύρεση Όλ_ων" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Μαρκάρισμα" -#: ../src/search.c:418 +#: ../src/search.c:433 #, fuzzy msgid "Mark all matches in the current document" msgstr "Μαρκάρει τα ευρήματα της αναζήτησης στο τρέχον έγγραφο." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "Στη _Συνεδρία" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "Στο Έγγρα_φο" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Κλείσιμο Διαλόγο_υ" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Απενεργοποίηση αυτής της επιλογής για να παραμένει διάλογος ανοιχτός." -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Αντικατάσταση & Εύ_ρεση" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Αντικα_τάσταση με:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Αντι_κατάσταση Όλων" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "Στην Επιλο_γή" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Αντικαθιστά τα ευρήματα της αναζήτησης στο τρέχον επιλεγμένο κείμενο." -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "Φάκε_λος:" -#: ../src/search.c:712 +#: ../src/search.c:727 #, fuzzy msgid "E_ncoding:" msgstr "Καθορισμός κωδικοποίησης:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Αντιστροφή αποτελεσμάτων αναζήτησης" -#: ../src/search.c:782 +#: ../src/search.c:797 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Αντιστροφή των αποτελεσμάτων αναζήτησης, για επιλογή των γραμμών που δεν " "είχαν αποτελέσματα αναζήτησης." -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Έ_ξτρα επιλογές:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 #, 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:1184 +#: ../src/search.c:1203 #, fuzzy, c-format msgid "Replaced text in %u file." msgid_plural "Replaced text in %u files." msgstr[0] "Αντικατάσταση κειμένου σε %u αρχεία." msgstr[1] "Αντικατάσταση κειμένου σε %u αρχεία." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Ο φάκελος για αναζήτηση σε αρχεία δεν υπάρχει." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Δεν υπάρχει κείμενο για αναζήτηση." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" -#: ../src/search.c:1400 +#: ../src/search.c:1419 #, fuzzy msgid "Searching..." msgstr "_Αναζήτηση" -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (στο φάκελο: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Δεν ήταν δυνατόν να ανοιχτεί ο φάκελος (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Δεν υπάρχουν αποτελέσματα αναζήτησης." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Κεφάλαιο" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Ενότητα" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Ενότ1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Ενότ2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Ενότ3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Παράρτημα" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Μονάδα" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../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:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 #, fuzzy msgid "Functions" msgstr "Συναρτήσεις" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Ενότητες" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Εντολή" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Περιβάλλον" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Υποενότητα" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 #, fuzzy msgid "Subsubsection" msgstr "Υπο-υποενότητα" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Ετικέτα" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 #, fuzzy msgid "Structures" msgstr "Κατάσταση" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Πακέτο" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Μου" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Τοπικό" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Μας" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Σταθερές" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 #, fuzzy msgid "ID Selectors" msgstr "Στην Επιλο_γή" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 #, fuzzy msgid "Type Selectors" msgstr "Επιλογή Όλων" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Μονάδες" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Σίνγκλετον" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Ιδιότητες" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Εξαγωγή" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Μέλη" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Ετικέτες" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Μακροεντολές" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 #, fuzzy msgid "Defines" msgstr "Γραμμές:" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 #, fuzzy msgid "Structs" msgstr "Κατάσταση" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Άγνωστη προέκταση τύπου αρχείου για \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" "Αποτυχία δημιουργίας αρχείου ετικετών, πιθανόν λόγω του ότι δεν βρέθηκαν " "ετικέτες.\n" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4246,7 +4307,7 @@ "Χρήση: %s -g <Αρχείο Ετικέτας> <Λίστα Αρχείου>\n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4257,179 +4318,187 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Φόρτωση ετικετών" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Αρχεία ετικέτας Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Φορτωμένες %s ετικέτες αρχείου '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Δεν ήταν δυνατόν να φορτωθεί το αρχείο ετικετών '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Ο καθορισμός του \"%s\" δεν βρέθηκε." -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "Εύρεση Όλ_ων" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "_Κλείσιμο Όλων" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Ταξινόμηση κατά _Όνομα" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Ταξινόμηση κατά _Εμφάνιση" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Αποθήκευση του τρέχοντος αρχείου" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "Αποθήκευση Ό_λων" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Αποθήκευση όλων των ανοιγμένων αρχείων" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Επαναφόρτωση του τρέχοντος αρχείου από τον δίσκο" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Κλείσιμο του τρέχοντος αρχείου" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 #, fuzzy msgid "Close all open files" msgstr "Κλείσιμο όλων των ανοιγμένων αρχείων" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 #, fuzzy msgid "Cut the current selection" msgstr "Μετατροπή σε πεζά/κεφαλαία των επιλεγμένων" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 #, fuzzy msgid "Copy the current selection" msgstr "Μεταγλώτιση του τρέχοντος αρχείου" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 #, fuzzy msgid "Delete the current selection" msgstr "Μετατροπή σε πεζά/κεφαλαία των επιλεγμένων" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Αναίρεση της τελευταίας τροποποίησης" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Επανάληψη της τελευταίας τροποποίησης" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Μεταγλώτιση του τρέχοντος αρχείου" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Εκτελέση ή εμφάνιση του τρέχοντος αρχείου" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" "Ανοίγει έναν επιλογέα χρωμάτων, για να επιλέξετε χρώματα από μια παλέτα." -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Μεγέθυνση στο κείμενο" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Σμίκρυνση από το κείμενο" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Μείωση εσοχής" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Αύξηση εσοχής" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr " Βρείτε το εισακτέο κείμενο στο τρέχον αρχείο" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 #, fuzzy msgid "Jump to the entered line number" msgstr "Μετάβαση στον εισακτέο αριθμό γραμμής." -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Κλείσιμου του Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "Έγγραφο XML" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Μαρκάρει τα ευρήματα της αναζήτησης στο τρέχον έγγραφο." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Δημιουργία νέου αρχείου" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Άνοιγμα υπάρχοντος αρχείου" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 #, fuzzy 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 "Εμφάνιση" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4496,125 +4565,147 @@ msgid "Characters:" msgstr "Χαρακτήρες:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Δεν βρέθηκαν ετικέτες" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Εμφάνιση Λίστας _Συμβόλων" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Εμφάνιση Λίστας Ε_γγράφων" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Από_κρυψη Πλευρικής Μπάρας" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Εμφάνιση _Πλήρης Διαδρομής Ονόματος" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "Καθορισμός κωδικοποίησης:" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "filetype: %s" msgstr "Καθορισμός τύπου αρχείου:" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Η γραμματοσειρά ενημερώθηκε (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Ρύθμιση Προσαρμοσμένης Διάταξης Ημερομηνίας" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Επιλογή Φακέλου" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Επιλογή Αρχείου" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 #, fuzzy msgid "C_onfiguration Files" msgstr "Αποτυχία μεταγλώτισης." -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +#, fuzzy +msgid "Save All" +msgstr "Αποθήκευση Ό_λων" + +#: ../src/ui_utils.c:1786 #, fuzzy 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 "Τερματικό" @@ -4799,165 +4890,149 @@ "τερματικού. Παρακαλώ σημειώστε, προγράμματα που εκτελούνται στο VTE δεν " "είναι δυνατόν να σταματήσουν." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Αρχεία έργου Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Εκτελέσιμα" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Σφάλμα" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Ερώτηση" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Προειδοποίηση" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Πληροφορία" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Δημιουργός Κλάσης" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Δημιουργεί τα πηγαία αρχεία για το νέο τύπο κλάσης." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Δημιουργία Κλάσης" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Κλάση" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Όνομα κλάσης:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Αρχείο κεφαλής:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Πηγαίο αρχείο:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 #, fuzzy msgid "Inheritance" msgstr "Κληρονομιά" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Βασική κλάση:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Βασική κεφαλή:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Γενικά" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 #, fuzzy msgid "Base GType:" msgstr "Βασική GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Επιλογές" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Δημιουργία κατασκευής" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Δημιουργία Κλά_σης" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 #, fuzzy msgid "_C++ Class" msgstr "C++ Κλάση" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 #, fuzzy msgid "_GTK+ Class" msgstr "GTK+ Κλάση" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Χαρακτήρες HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Εισάγει οντότητες HTML χαρακτήρων όπως &'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Η δημιουργική ομάδα του Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML χαρακτήρες" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 χαρακτήρες" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Ελληνικοί χαρακτήρες" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Μαθηματικοί χαρακτήρες" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Τεχνικοί χαρακτήρες" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Χαρακτήρες στίξης" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Διάφοροι χαρακτήρες" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Ειδικοί Χαρακτήρες" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Εισαγωγή" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4966,64 +5041,64 @@ "σε αυτό ή με τη χρήση του κουμπιού εισάγετέ το στην τρέχουσα θέση του " "κέρσορα." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Χαρακτήρας" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (όνομα)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Εισαγωγή Ει_δικών HTML Χαρακτήρων" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "Αντικατάσταση" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Τοποθέτηση των νέων ετικετών αρχείων:" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Εισαγωγή Ειδικών Χαρακτήρων HTML" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "Ειδικοί Χαρακτήρες" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 #, fuzzy msgid "Toggle plugin status" msgstr "Ενεργοποίηση/απενεργοποίηση σχολίων γραμμής" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Εξαγωγή" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Εξάγει το τρέχον αρχείο σε διάφορες μορφές." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Εξαγωγή Αρχείου" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Χρήση τρέχοντος επιπέδου μεγέθυνσης" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 #, fuzzy msgid "" "Renders the font size of the document together with the current zoom level" @@ -5031,102 +5106,102 @@ "Αποδίδει το μέγεθος της γραμματοσειράς του εγγράφου μαζί με το τρέχον " "επίπεδο μεγέθυνσης." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Η εξαγωγή του εγγράφου ως '%s'έγινε με επιτυχία." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Το αρχείο '%s' δεν ήταν δυνατόν να γραφεί (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Το αρχείο '%s' υπάρχει ήδη. Θέλετε να αντικατασταθεί;" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Εξαγωγή" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 #, fuzzy msgid "As _HTML" msgstr "Ως HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 #, fuzzy msgid "As _LaTeX" msgstr "Ως LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Φυλλομετρητής Αρχείων" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Προσθέτει μια ετικέτα φιλλομετρητή αρχείων στη πλευρική μπάρα." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Επιλέχθηκαν πάρα πολλά αντικείμενα!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" "Δεν ήταν δυνατόν να εκτελεστεί η προσαρμοσμένη εξωτερική εντολή %s' (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Άνοιγμα εξωτερι_κά" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Εύρεση σε Αρχεία" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Εμφάνιση Κ_ρυφών Αρχείων" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Πάνω" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Ανανέωση" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Αρχικός Κατάλογος" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Καθορισμός διαδρομής από το έγγραφο" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 #, fuzzy msgid "Clear the filter" msgstr "Κλείσιμο του τρέχοντος αρχείου" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 #, fuzzy msgid "Filter:" msgstr "Αρχείο" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων των επιπρόσθετων." @@ -5169,7 +5244,7 @@ #: ../plugins/filebrowser.c:1128 #, fuzzy -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "Δημιουργία φακέλλου της βασικής διαδρομής του έργου;" #: ../plugins/filebrowser.c:1132 @@ -5178,32 +5253,32 @@ "Change the directory to the base directory of the currently opened project" msgstr "Δημιουργία diff από τον φάκελο του τρέχοντος ενεργού αρχείου" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 #, fuzzy msgid "Save Actions" msgstr "Ενότητες" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, fuzzy, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Δεν ήταν δυνατόν να δημιουργηθεί ο φάκελος ρυθμίσεων (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, fuzzy, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Το αρχείο '%s' δεν ήταν δυνατόν να γραφεί (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, fuzzy, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Αδύνατη η διακοπή της διαδικασίας (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, fuzzy, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5211,111 +5286,128 @@ msgstr[1] "Αυτόματη αποθήκευση: Αποθηκεύτηκαν %d αρχεία αυτόματα." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 #, fuzzy msgid "Select Directory" msgstr "Επιλογή τρέχουσας λέξης" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "" -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Αυτόματη Αποθήκευση" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 #, fuzzy msgid "seconds" msgstr "%s εντολές" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 #, fuzzy msgid "_Print status message if files have been automatically saved" msgstr "Εκτύπωση μηνύματος κατάστασης εάν έχουν αποθηκευτεί αρχεία αυτόματα" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 #, fuzzy msgid "Save only current open _file" msgstr "Αποθήκευση μόνο του τρέχοντος αρχείου" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 #, fuzzy msgid "Sa_ve all open files" msgstr "Αποθήκευση όλων των ανοιγμένων αρχείων" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 #, fuzzy msgid "Instant Save" msgstr "Εισαγωγή ημερομηνίας" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 #, fuzzy msgid "_Filetype to use for newly opened files:" msgstr "" "Θέτει την προκαθορισμένη κωδικοποίηση για τα πρόσφατα δημιουργημένα αρχεία." -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Μαρκάρει τα ευρήματα της αναζήτησης στο τρέχον έγγραφο." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "" +#~ msgid "Diff file" +#~ msgstr "Αρχείο Diff" + +#~ msgid "reStructuredText file" +#~ msgstr "Αρχείο reStructuredText" + +#~ msgid "Select _All" +#~ msgstr "Επιλο_γή Όλων" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Αυτόματη ολοκλήρωση συμβόλων" + #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Αποτυχία εμφάνισης %s (σιγουρευτείτε εάν έχει μεταγλωτιστεί)" @@ -5563,9 +5655,6 @@ #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "Δεν βρέθηκε το αρχείο pixmap: %s" -#~ msgid "Show _Full Path Name" -#~ msgstr "Εμφάνιση _Πλήρης Διαδρομής Ονόματος" - #~ msgid "Terminal emulation:" #~ msgstr "Εξομοίωση τερματικού:" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/en_GB.po /tmp/ssBwSf4GIv/geany-0.18/po/en_GB.po --- geany-0.17/po/en_GB.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/en_GB.po 2009-08-16 17:18:28.000000000 +0100 @@ -1,16 +1,16 @@ # British English translation of geany. # Copyright (C) 2007 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. -# Jeff Bailes , 2007, 2008. +# Jeff Bailes , 2007-2009. # # msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" -"PO-Revision-Date: 2009-02-05 23:05+1100\n" -"Last-Translator: Frank Lanitz \n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"PO-Revision-Date: 2009-08-03 21:19+1000\n" +"Last-Translator: Jeff Bailes \n" "Language-Team: British English \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,68 +29,68 @@ msgid "Integrated Development Environment" msgstr "Integrated Development Environment" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "About Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "A fast and lightweight IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Info" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Developers" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "maintainer" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "developer" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "translation maintainer" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Translators" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Previous Translators" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Contributors" -#: ../src/about.c:340 +#: ../src/about.c:342 #, 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Credits" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licence" -#: ../src/about.c:389 +#: ../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." @@ -98,7 +98,7 @@ "Licence text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -107,130 +107,130 @@ "Could not find terminal \"%s\" (check path for Terminal tool setting in " "Preferences)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Process failed (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (in directory: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Failed to change the working directory to \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Compilation failed." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Compilation finished successfully." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Compile" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 msgid "_Build" msgstr "_Build" #. build the code with make all -#: ../src/build.c:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make _Object" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Next Error" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "_Previous Error" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "_Set Includes and Arguments" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_View DVI File" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "V_iew PDF File" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Set Arguments" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Set Arguments" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "DVI creation:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "PDF creation:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "DVI preview:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "PDF preview:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -239,68 +239,68 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Set Includes and Arguments" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Set the commands for building and running programs." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s commands" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Compile:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Build:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Execute:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Build the current file" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make Custom Target" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Enter custom options here, all entered text is passed to the make command." -#: ../src/build.c:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Compile the current file with Make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Failed to execute the view program" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Process could not be stopped (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "No more build errors." @@ -308,8 +308,8 @@ msgid "Do you really want to quit?" msgstr "Do you really want to quit?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Reload" @@ -322,53 +322,53 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Are you sure you want to reload '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Go to Line" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Enter the line you want to go to:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Use Custom Date Format" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Custom Date Format" -#: ../src/callbacks.c:1495 +#: ../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." @@ -376,24 +376,24 @@ "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:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "No more message items." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Open File" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_View" -#: ../src/dialogs.c:150 +#: ../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." @@ -401,29 +401,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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Detect by file extension" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Detect from file" -#: ../src/dialogs.c:259 -#, fuzzy +#: ../src/dialogs.c:258 msgid "_More Options" -msgstr "Options" +msgstr "_More Options" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Show _hidden files" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Set encoding:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -438,11 +437,11 @@ "encoding." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Set filetype:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -454,23 +453,31 @@ "Note if you choose multiple files, they will all be opened with the chosen " "filetype." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Overwrite?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Filename already exists!" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Save File" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "R_ename" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Save the file and rename it" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Open file in a new tab" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -478,24 +485,41 @@ "Keep the current unsaved document open and open the newly saved file in a " "new tab" -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Error" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Question" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Warning" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Information" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Don't save" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "The file '%s' is not saved." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Do you want to save it before closing?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Choose font" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -503,106 +527,106 @@ "An error occurred or file information could not be retrieved (e.g. from a " "new file)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "unknown" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Properties" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Type:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Size:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Location:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Read-only:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(only inside Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Encoding:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(with BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(without BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Modified:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Changed:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Accessed:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Permissions:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Read:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Write:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Owner:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Group:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Other:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "File %s closed." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "New file \"%s\" opened." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Could not open file %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -617,12 +641,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "The file \"%s\" is not valid %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -631,49 +655,51 @@ "The file \"%s\" does not look like a text file or the file encoding is not " "supported." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Spaces" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabs" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setting %s indentation mode for %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Invalid filename" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "File %s reloaded." -#: ../src/document.c:1354 +#. 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 "File %s opened(%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", read-only" -#: ../src/document.c:1561 -#, fuzzy +#: ../src/document.c:1512 msgid "Error renaming file." -msgstr "Error saving file." +msgstr "Error renaming file." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -682,7 +708,7 @@ "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -691,52 +717,52 @@ "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Error message: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Error saving file." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Error saving file (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "File %s saved." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" was not found." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Wrap search and find again?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "No matches found for \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: replaced %d occurrence of \"%s\" with \"%s\"." msgstr[1] "%s: replaced %d occurrences of \"%s\" with \"%s\"." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Do you want to reload it?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -745,32 +771,20 @@ "The file '%s' on the disk is more recent than\n" "the current buffer." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Try to resave the file?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "File \"%s\" was not found on disk!" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Enter Tab Width" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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." @@ -872,133 +886,122 @@ msgstr "Chinese Traditional" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japanese" -#: ../src/encodings.c:141 ../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 "Korean" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Without encoding" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_West European" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_East European" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "East _Asian" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_SE & SW Asian" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Middle Eastern" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "None" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s source file" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "%s file" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "None" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Shell script file" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML document" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL Dump file" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff file" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Config file" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext translation file" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s script file" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStructuredText file" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "_Programming Languages" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "_Scripting Languages" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "_Markup Languages" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "M_iscellaneous Languages" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "All Source" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "All files" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Bad regex for filetype %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "untitled" @@ -1012,8 +1015,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "invisible" @@ -1021,7 +1024,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Open Selected F_ile" @@ -1041,11 +1044,11 @@ msgid "Page Set_up" msgstr "Page Set_up" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Close Ot_her Documents" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "C_lose All" @@ -1053,91 +1056,85 @@ msgid "_Edit" msgstr "_Edit" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Select _All" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "T_oggle Case of Selection" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Comment Line(s)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "U_ncomment Line(s)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "_Toggle Line Commentation" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "_Increase Indent" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "_Decrease Indent" -#: ../src/interface.c:526 ../src/interface.c:1995 -#, fuzzy +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" -msgstr "_Send Selection to" +msgstr "_Send Selection to Terminal" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Send Selection to" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "I_nsert Comments" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Insert _ChangeLog Entry" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Insert File _Header" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Insert _Function Description" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Insert _Multiline Comment" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Insert _GPL Notice" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Insert _BSD License Notice" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Insert Dat_e" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "_Insert \"include <...>\"" #: ../src/interface.c:613 -#, fuzzy msgid "Preference_s" -msgstr "Preferences" +msgstr "Preference_s" #: ../src/interface.c:621 msgid "_Search" @@ -1155,7 +1152,7 @@ msgid "Find in F_iles" msgstr "Find in F_iles" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Replace" @@ -1175,7 +1172,7 @@ msgid "Pr_evious Message" msgstr "Pr_evious Message" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "_Go to Line" @@ -1203,7 +1200,7 @@ msgid "Show Side_bar" msgstr "Show Side_bar" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1247,15 +1244,15 @@ msgid "In_dent Type" msgstr "In_dent Type" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tabs" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Spaces" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_abs and Spaces" @@ -1332,9 +1329,8 @@ msgstr "_Open" #: ../src/interface.c:955 -#, fuzzy msgid "_Recent Projects" -msgstr "Open Project" +msgstr "_Recent Projects" #: ../src/interface.c:959 msgid "_Close" @@ -1376,7 +1372,7 @@ msgid "_Debug Messages" msgstr "_Debug Messages" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Symbols" @@ -1400,72 +1396,75 @@ msgid "Scribble" msgstr "Scribble" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Images _and Text" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "_Images Only" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "_Text Only" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "_Large Icons" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "_Small Icons" -#: ../src/interface.c:1760 ../src/interface.c:3306 -#, fuzzy +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" -msgstr "_Small Icons" +msgstr "_Very Small Icons" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" -msgstr "_Hide toolbar" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "_Customise Toolbar" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" +msgstr "_Hide Toolbar" + +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Find _Usage" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Find _Document Usage" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Go to _Tag Definition" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Go to T_ag Declaration" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Conte_xt Action" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Preferences" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Load files from the last session" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Opens at startup the files from the last session" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Load virtual terminal support" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1473,39 +1472,39 @@ "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Enable plugin support" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Startup" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Save window position and geometry" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Confirm exit" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Shows a confirmation dialogue on exit" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Shutdown" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Startup path:" -#: ../src/interface.c:2758 +#: ../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." @@ -1513,39 +1512,41 @@ "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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Project files:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Path to start in when opening project files" -#: ../src/interface.c:2796 -#, fuzzy +#: ../src/interface.c:2816 msgid "Extra plugin path:" -msgstr "Enable plugin support" +msgstr "Extra plugin path:" -#: ../src/interface.c:2808 +#: ../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 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." -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Paths" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Startup" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Beep on errors or when compilation has finished" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1553,11 +1554,11 @@ "Whether to beep if an error occurred or when the compilation process has " "finished" -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Switch to status message list at new message" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1565,11 +1566,11 @@ "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Suppress status messages in the status bar" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1577,11 +1578,11 @@ "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" -msgstr "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" +msgstr "Auto-focus widgets (focus follows mouse)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1591,15 +1592,15 @@ "the main editor widget, the scribble, the toolbar search and goto line " "fields and the VTE." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Miscellaneous" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Always wrap search and hide the Find dialogue" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1607,11 +1608,11 @@ "Always wrap search around the document and hide the Find dialogue after " "clicking Find Next/Previous" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 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:2896 +#: ../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" @@ -1619,19 +1620,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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Search" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Use project-based session files" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1639,12 +1640,11 @@ "Whether to store a project's session files and open them when re-opening the " "project" -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Store project file inside the project base directory" -#: ../src/interface.c:2929 -#, fuzzy +#: ../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 " @@ -1654,77 +1654,77 @@ "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 dialogue" +"Project dialogue." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projects" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Miscellaneous" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "General" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Show symbol list" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Toggle the symbol list on and off" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Show documents list" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Toggle the documents list on and off" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Sidebar" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Symbol list:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Message window:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Sets the font for the message window" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Sets the font for the symbol list" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Sets the editor font" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Fonts" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Show editor tabs" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Show close buttons" -#: ../src/interface.c:3064 +#: ../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)" @@ -1732,106 +1732,109 @@ "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Placement of new file tabs:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Left" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Right" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Double-clicking hides all additional widgets" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Calls the View->Toggle All Additional Widgets command" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Editor tabs" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Top" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Bottom" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Sidebar:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Tab positions" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Show status bar" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3222 -#, fuzzy +#: ../src/interface.c:3242 msgid "Show T_oolbar" -msgstr "Show Toolbar" +msgstr "Show T_oolbar" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" -msgstr "" +msgstr "_Append Toolbar to the Menu" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" +msgstr "Pack the toolbar to the main menu to save vertical space" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Toolbar" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Icon style:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Icon size:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Appearance" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "Customise Toolbar" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Toolbar" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Line wrapping" -#: ../src/interface.c:3349 +#: ../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 " @@ -1841,11 +1844,11 @@ "line wrapping has a high performance cost for large documents so should be " "disabled on slow machines." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Enable \"smart\" home key" -#: ../src/interface.c:3354 +#: ../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 " @@ -1859,11 +1862,11 @@ "key always moves the caret to the start of the current line, regardless of " "its current position." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Disable Drag and Drop" -#: ../src/interface.c:3359 +#: ../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" @@ -1871,32 +1874,31 @@ "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:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Enable folding" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Whether to enable folding the code" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Fold/unfold all children of a fold point" -#: ../src/interface.c:3369 -#, fuzzy +#: ../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 "" "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" +"clicking on a fold symbol the contrary behaviour is used." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Use indicators to show compile errors" -#: ../src/interface.c:3374 +#: ../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" @@ -1904,23 +1906,23 @@ "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Newline strips trailing spaces" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Line breaking column:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Comment toggle marker:" -#: ../src/interface.c:3406 +#: ../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." @@ -1928,65 +1930,65 @@ "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:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Features" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Features" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Auto-indent mode:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Basic" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Current chars" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Match braces" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Type:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Width:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "The width in chars of a single indent" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Use spaces when inserting indentation" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Use one tab per indent" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" "Use spaces if the total indent is less than the tab width, otherwise use both" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Hard tab width:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -1994,29 +1996,29 @@ "Whether to detect the indentation type from file contents when a file is " "opened" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Tab key indents" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Snippet completion" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2024,19 +2026,19 @@ "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" -#: ../src/interface.c:3583 -msgid "XML tag auto completion" -msgstr "XML tag auto completion" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" +msgstr "XML tag autocompletion" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Automatic continuation of multi-line comments" -#: ../src/interface.c:3591 +#: ../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" @@ -2044,11 +2046,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:3593 -msgid "Automatic symbol completion" -msgstr "Automatic symbol completion" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "Autocomplete symbols" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2056,92 +2058,99 @@ "Automatic completion of known symbols in open files (function names, global " "variables, ...)" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "Autocomplete all words in document" + +#: ../src/interface.c:3646 +msgid "Drop rest of word on completion" +msgstr "Drop rest of word on completion" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Max. symbol name suggestions:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Completion list height:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "Characters to type for completion:" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" +msgstr "Characters to type for autocompletion:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" -msgstr "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" +msgstr "Display height in rows for the autocompletion list" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" -msgstr "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Completions" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Brackets ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Auto-close brackets when typing an opening one" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Single quotes ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "Auto-close simple quote when typing an opening one" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Curly brackets { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Auto-close curly bracket when typing an opening one" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Square brackets [ ]" -#: ../src/interface.c:3698 -#, fuzzy +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" -msgstr "Auto-close squre-bracket when typing an opening one" +msgstr "Auto-close square-bracket when typing an opening one" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Double quotes \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "Auto-close double quote when typing an opening one" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Auto-close quotes and brackets" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Completions" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Invert syntax highlighting colours" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2149,44 +2158,43 @@ "Use white text on a black background and invert all colours, this option " "requires a restart of Geany" -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Show indentation guides" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Show white space" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marks spaces with dots and tabs with arrows" -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Show line endings" -#: ../src/interface.c:3753 -#, fuzzy +#: ../src/interface.c:3805 msgid "Shows the line ending character" -msgstr "Show the line ending character" +msgstr "Shows the line ending character" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Show line numbers" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Shows or hides the Line Number margin" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Show markers margin" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2194,36 +2202,36 @@ "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Stop scrolling at last line" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Display" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Long line marker:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Long line marker colour:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Sets the colour of the long line marker" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Colour Chooser" -#: ../src/interface.c:3826 +#: ../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 " @@ -2233,11 +2241,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:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Line" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2245,11 +2253,11 @@ "Prints a vertical line in the editor window at the given cursor position " "(see below)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Background" -#: ../src/interface.c:3846 +#: ../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 " @@ -2259,55 +2267,55 @@ "below) changed to the colour set below, (this is recommended if you use " "proportional fonts)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Disabled" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Long line marker" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Display" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Open new documents from the command-line" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Default end of line characters:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "New files" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Default encoding (new files):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Default encoding (existing files):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Use fixed encoding when opening files" -#: ../src/interface.c:3978 +#: ../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 " @@ -2317,52 +2325,52 @@ "opening files and opens the file with the specified encoding (usually not " "needed)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Encodings" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Ensure new line at file end" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Strip trailing spaces and tabs" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Replace tabs by space" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Replaces all tabs in document by spaces" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Saving files" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Recent files list length:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Disk check timeout:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2370,27 +2378,27 @@ "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Files" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Path and options for the make tool" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2398,23 +2406,23 @@ "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Path (and possibly additional arguments) to your favourite browser" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Tool paths" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Context action:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2425,67 +2433,67 @@ "can appear anywhere in the given command and will be replaced before " "execution." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Commands" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Tools" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "e-mail address of the developer" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Initials of the developer name" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Initial version:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Version number, which a new file initially has" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Company name" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Developer:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Company:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Mail address:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Initials:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "The name of the developer" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Year:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Date:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Date & Time:" -#: ../src/interface.c:4382 +#: ../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." @@ -2493,7 +2501,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:4389 +#: ../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." @@ -2501,7 +2509,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:4396 +#: ../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." @@ -2509,85 +2517,82 @@ "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:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Template data" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Templates" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "C_hange" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Keyboard shortcuts" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Keybindings" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Command:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Use an external command for printing" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Print line numbers" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Add line numbers to the printed page" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Print page numbers" -#: ../src/interface.c:4518 ../src/printing.c:352 -#, fuzzy +#: ../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 "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page" +"Add page numbers at the bottom of each page. It takes 2 lines of the page." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Print page header" -#: ../src/interface.c:4523 ../src/printing.c:357 -#, fuzzy +#: ../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 "" -"Adds 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." +"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:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Use the basename of the printed file" -#: ../src/interface.c:4543 -#, fuzzy +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" -msgstr "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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Date format:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2597,536 +2602,551 @@ "header on each page. You can use any conversion specifiers which can be used " "with the ANSI C strftime function." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Use native GTK printing" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Printing" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Project Properties" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "File" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "New" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Open" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Open selected file" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Save" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Save as" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Save all" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Print" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Close" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Close all" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Reload file" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Project" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Project properties" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Undo" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Redo" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Duplicate line or selection" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Delete current line(s)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Scroll to current line" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Scroll up the view by one line" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Scroll down the view by one line" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Complete snippet" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Move cursor in snippet" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Suppress snippet completion" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Context Action" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Complete word" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Show calltip" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Show macro list" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Clipboard" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Cut" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Copy" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Paste" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Copy current line(s)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Cut current line(s)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Select" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Select All" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Select current word" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Select current line(s)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Select current paragraph" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Toggle Case of Selection" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Toggle line commentation" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Comment line(s)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Uncomment line(s)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Increase indent" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Decrease indent" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Increase indent by one space" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Decrease indent by one space" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Smart line indent" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Send to Custom Command 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Send to Custom Command 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Send to Custom Command 3" -#: ../src/keybindings.c:317 -#, fuzzy +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" -msgstr "_Send Selection to" +msgstr "Send Selection to Terminal" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "Reflow lines/block" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Insert" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Insert date" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Insert alternative white space" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Settings" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Search" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Find" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Find Next" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Find Previous" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Find Next Selection" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Find Previous Selection" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Replace" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Find in Files" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Next Message" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Previous Message" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Find Usage" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Find Document Usage" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "Mark All" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Go to" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Navigate back a location" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Navigate forwards a location" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Go to matching brace" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Toggle marker" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Go to next marker" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Go to previous marker" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Go to Tag Definition" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Go to Tag Declaration" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Go to Start of Line" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Go to End of Line" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "Go to End of Display Line" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Go to Previous Word Part" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Go to Next Word Part" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "View" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Toggle All Additional Widgets" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Fullscreen" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Toggle Messages Window" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Toggle Sidebar" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Zoom In" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Zoom Out" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Focus" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Switch to Editor" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Switch to Scribble" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Switch to VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Switch to Search Bar" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Switch to Sidebar" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Switch to Compiler" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Notebook tab" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Switch to left document" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Switch to right document" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Switch to last used document" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Move document left" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Move document right" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Move document first" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Move document last" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Document" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Toggle Line wrapping" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Toggle Line breaking" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Replace spaces by tabs" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Toggle current fold" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Fold all" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Unfold all" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Reload symbol list" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Build" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Compile" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Make custom target" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Next error" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Previous error" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Run" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Run (alternative command)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Build options" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Show Colour Chooser" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Help" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Keyboard Shortcuts" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "The following keyboard shortcuts are configurable:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Switch to Document" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Failed to load one or more session files." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Debug Messages" @@ -3183,8 +3203,8 @@ msgstr "Print Geany's installation prefix" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "don't load the previous session's files" +msgid "Don't load the previous session's files" +msgstr "Don't load the previous session's files" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3198,24 +3218,24 @@ msgid "Show version and exit" msgstr "Show version and exit" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[FILES...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Move it now?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3226,7 +3246,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3235,7 +3255,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:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3246,22 +3266,22 @@ "There could be some problems using Geany without a configuration directory.\n" "Start Geany anyway?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "This is Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Configuration directory could not be created (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Configuration files reloaded." @@ -3277,7 +3297,7 @@ msgid "_Hide Message Window" msgstr "_Hide Message Window" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3286,11 +3306,11 @@ "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "_Plugin Manager" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3301,23 +3321,23 @@ "Description: %s\n" "Author(s): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Active" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "No plugins available." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3325,48 +3345,56 @@ "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Plugin details:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Action" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Shortcut" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Grab Key" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "_Expand All" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "_Collapse All" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Action" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Shortcut" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Override" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Override that keybinding?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "The combination '%s' is already used for \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3374,7 +3402,7 @@ "Set the information to be used in templates. See the documentation for " "details." -#: ../src/prefs.c:1458 +#: ../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." @@ -3385,7 +3413,7 @@ "" #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3396,7 +3424,7 @@ "action to edit the string representation of the shortcut directly." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3404,17 +3432,8 @@ "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)." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"Notice: To customise the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3422,45 +3441,52 @@ "Warning: these settings are overridden by the current project. See " "Project->Properties." -#: ../src/printing.c:270 +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "The editor font is not a monospaced font!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "Text will be wrongly spaced." + +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Page %d of %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Document Setup" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Page %d of %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Printing of file %s was cancelled." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "File %s printed." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Printing of %s failed (%s)." -#: ../src/printing.c:832 -#, fuzzy +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." -msgstr "Please set a print command in the preferences dialogue first" +msgstr "Please set a print command in the preferences dialogue first." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3471,7 +3497,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Printing of \"%s\" failed (return code: %s)." @@ -3490,19 +3516,19 @@ msgid "C_reate" msgstr "C_reate" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Name:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Filename:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Base path:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3512,41 +3538,41 @@ "path, or an existing directory tree. You can use paths relative to the " "project filename." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Choose Project Base Path" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Project file \"%s\" could not be loaded." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Open Project" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Project files" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Project \"%s\" closed." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Description:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Make in base path" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Run command:" -#: ../src/project.c:457 +#: ../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." @@ -3554,81 +3580,81 @@ "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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "File patterns:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Do you want to close it before proceeding?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "The '%s' project is already open." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "The specified project name is too short." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "You have specified an invalid project filename." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Create the project's base path directory?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "The path \"%s\" does not exist." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Project base directory could not be created (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Project file could not be written (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Project \"%s\" created." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Project \"%s\" saved." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Choose Project Filename" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Choose Project Run Command" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Project \"%s\" opened." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "_Use regular expressions" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3636,15 +3662,15 @@ "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Search _backwards" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Use _escape sequences" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3652,394 +3678,401 @@ "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "C_ase sensitive" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Match only a _whole word" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Match from s_tart of word" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Previous" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Next" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Search for:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Find All" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Mark" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Mark all matches in the current document" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "In Sessi_on" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "_In Document" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Close _dialogue" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Disable this option to keep the dialogue open" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Replace & Fi_nd" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Replace wit_h:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Re_place All" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "In Se_lection" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Replace all matches found in the currently selected text" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Directory:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "E_ncoding:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Fixed s_trings" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Grep regular expressions" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "See grep's manual page for more information" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Extended regular expressions" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "_Recurse in subfolders" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Invert search results" -#: ../src/search.c:782 -#, fuzzy +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" -msgstr "Invert the sense of matching, to select non-matching lines." +msgstr "Invert the sense of matching, to select non-matching lines" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "E_xtra options:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Other options to pass to Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "Found %d match for \"%s\"." msgstr[1] "Found %d matches for \"%s\"." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Invalid directory for find in files." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "No text to find." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Searching..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (in directory: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Could not open directory (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "No matches found." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Chapter" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Section" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Appendix" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Other" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Module" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Types" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Type constructors" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Functions" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Sections" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Keys" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Variables" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Command" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Environment" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Subsection" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Subsubsection" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Label" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Structures" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Package" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "My" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Our" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Classes" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Constants" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Anchors" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "H1 Headings" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "H2 Headings" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "H3 Headings" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "ID Selectors" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Type Selectors" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Modules" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Methods" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Namespaces" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Procedures" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "Imports" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Members" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Labels" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Subroutines" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blocks" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Defines" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Namespaces" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unknown filetype extension for \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4048,7 +4081,7 @@ "Usage: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4059,171 +4092,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Load Tags" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Loaded %s tags file '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Could not load tags file '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Forward declaration \"%s\" not found." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition of \"%s\" not found." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "_Expand All" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "_Collapse All" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Sort by _Name" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Sort by _Appearance" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Save the current file" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Save All" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Save all open files" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Reload the current file from disk" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Close the current file" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Close all open files" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Cut the current selection" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Copy the current selection" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Paste the contents of the clipboard" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Delete the current selection" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Undo the last modification" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Redo the last modification" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Compile the current file" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Run or view the current file" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Zoom in the text" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Zoom out the text" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Decrease indentation" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Increase indentation" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Find the entered text in the current file" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Jump to the entered line number" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Show the preferences dialogue" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Quit Geany" -#: ../src/toolbar.c:75 -#, fuzzy +#: ../src/toolbar.c:79 msgid "Print document" -msgstr "XML document" +msgstr "Print document" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "Replace text in the current document" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Create a new file" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Open an existing file" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Goto" +#: ../src/toolbar.c:533 +msgid "Separator" +msgstr "Separator" + +#: ../src/toolbar.c:534 +msgid "--- Separator ---" +msgstr "--- Separator ---" + +#: ../src/toolbar.c:897 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." + +#: ../src/toolbar.c:913 +msgid "Available Items" +msgstr "Available Items" + +#: ../src/toolbar.c:934 +msgid "Displayed Items" +msgstr "Displayed Items" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4291,123 +4332,143 @@ msgid "Characters:" msgstr "Characters:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "No tags found" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Show S_ymbol List" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Show _Document List" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "H_ide Sidebar" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "Show _Paths" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "line: %d\t col: %d\t sel: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "mode: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "encoding: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "filetype: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "scope: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Font updated (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C Standard Library" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Library)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ Standard Library" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Set Custom Date Format" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Select Folder" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Select File" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "C_onfiguration Files" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Save All" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Close All" +#: ../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 "Terminal" @@ -4574,161 +4635,145 @@ "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geany project files" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Executables" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Error" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Question" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Warning" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Information" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Class Builder" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Creates source files for new class types." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Create Class" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Class" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Class name:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Header file:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Source file:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Inheritance" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Base class:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Base header:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Base GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Options" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Create constructor" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Create destructor" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+ constructor type" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Create Cla_ss" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "_C++ Class" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "_GTK+ Class" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML Characters" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Inserts HTML character entities like '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "The Geany developer team" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML characters" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 characters" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Greek characters" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Mathematical characters" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Technical characters" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Arrow characters" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Punctuation characters" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Miscellaneous characters" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Special Characters" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Insert" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4736,161 +4781,156 @@ "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:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Character" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (name)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_Insert Special HTML Characters" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 -#, fuzzy +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" -msgstr "Tab placement" +msgstr "HTML Replacement" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" -msgstr "" +msgstr "_HTMLToggle" -#: ../plugins/htmlchars.c:715 -#, fuzzy +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" -msgstr "Placement of new file tabs:" +msgstr "Bulk replacement of special chars" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Insert Special HTML Characters" -#: ../plugins/htmlchars.c:733 -#, fuzzy +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" -msgstr "Special Characters" +msgstr "Replace special characters" -#: ../plugins/htmlchars.c:736 -#, fuzzy +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" -msgstr "Toggle line commentation" +msgstr "Toggle plugin status" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Export" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exports the current file into different formats." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Export File" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Use current zoom level" -#: ../plugins/export.c:193 -#, fuzzy +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" -"Renders the font size of the document together with the current zoom level." +"Renders the font size of the document together with the current zoom level" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Document successfully exported as '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "File '%s' could not be written (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Export" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "As _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "As _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "File Browser" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Adds a file browser tab to the sidebar." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Too many items selected!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Could not execute configured external command '%s' (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Open _externally" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Find in Files" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Show _Hidden Files" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Up" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Refresh" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Set path from document" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Clear the filter" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Focus File List" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Focus Path Entry" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "Plugin configuration directory could not be created." @@ -4930,8 +4970,8 @@ "obj. *.so, *.dll, *.a, *.lib" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" -msgstr "Set the project's base directory" +msgid "Use the project's base directory" +msgstr "Use the project's base directory" #: ../plugins/filebrowser.c:1132 msgid "" @@ -4939,31 +4979,31 @@ msgstr "" "Change the directory to the base directory of the currently opened project" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Save Actions" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "This plugin provides different actions related to saving of files." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Backup Copy: Directory could not be created (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Backup Copy: File could not be read (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Backup Copy: File could not be saved (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4971,105 +5011,132 @@ msgstr[1] "Autosave: Saved %d files automatically." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Select Directory" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Backup directory does not exist or is not writable." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Auto Save" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Enable" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "Auto save _interval:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "seconds" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "_Print status message if files have been automatically saved" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Save only current open _file" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Sa_ve all open files" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Instant Save" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "_Filetype to use for newly opened files:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Backup Copy" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Directory to save backup files in:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "Date/_Time format for backup files (\"man strftime\" for details):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Directory _levels to include in the backup destination:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Split Window" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Splits the editor view into two windows." -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Show the current document" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Unsplit" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Split Window" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Horizontally" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Vertically" -#: ../plugins/splitwindow.c:422 -#, fuzzy +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" -msgstr "_Horizontally" +msgstr "Split Horizontally" -#: ../plugins/splitwindow.c:424 -#, fuzzy +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" -msgstr "_Vertically" +msgstr "Split Vertically" -#: ../plugins/splitwindow.c:426 -#, fuzzy +#: ../plugins/splitwindow.c:431 msgid "Unsplit" -msgstr "_Unsplit" +msgstr "Unsplit" + +#~ msgid "Diff file" +#~ msgstr "Diff file" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText file" + +#~ msgid "Select _All" +#~ msgstr "Select _All" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Automatic symbol completion" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "Notice: To customise the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Failed to view %s (make sure it is already compiled)" @@ -5337,9 +5404,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Structs / Typedefs" -#~ msgid "Show _Full Path Name" -#~ msgstr "Show _Full Path Name" - #~ msgid "Terminal emulation:" #~ msgstr "Terminal emulation:" @@ -5541,10 +5605,6 @@ #~ msgid "Complete construct" #~ msgstr "Complete construct" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Suppress construct completion" - #~ msgid "Go to tag definition" #~ msgstr "Go to tag definition" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/es.po /tmp/ssBwSf4GIv/geany-0.18/po/es.po --- geany-0.17/po/es.po 2009-04-24 19:56:59.000000000 +0100 +++ geany-0.18/po/es.po 2009-08-16 17:18:28.000000000 +0100 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.1\n" -"Report-Msgid-Bugs-To: geany-i18n@uvena.de\n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"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-04-24 16:31+0100\n" "Last-Translator: Antonio Jimenez \n" "Language-Team: Spanish \n" @@ -29,53 +29,53 @@ msgid "Integrated Development Environment" msgstr "Entorno Integrado de Desarrollo" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Acerca de Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Un IDE rápido y liviano" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(construido el o despues del %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Información" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Desarrolladores" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "mantenedor" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "desarrollador" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "mantenedor de traducción" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Traductores" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Traductores Anteriores" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Colaboradores" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -83,15 +83,15 @@ "Algunos de los muchos colaboradores (para una lista más detallada, véase el " "archivo %s):" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Créditos" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licencia" -#: ../src/about.c:389 +#: ../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." @@ -99,7 +99,7 @@ "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" -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -108,133 +108,133 @@ "No se pudo encontrar la terminal \"%s\" (verifique las rutas para la " "herramienta de terminal en las Preferencias)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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)" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Falló el proceso (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (en directorio: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Fallo al cambiar el directorio de trabajo a \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 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." -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "La compilación falló." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "La compilación terminó con éxito." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Compilar" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Make Obje_tivo Personalizado" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make _Object" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Siguie_nte Error" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Error _anterior" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "_Selecciona Inclusiones y Argumentos" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_Ver Archivo DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "V_er Archivo PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Seleccionar argumentos" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Seleccionar argumentos" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Creación de DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Creación de PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Previsualización de DVI" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Previsualización de PDF" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -244,73 +244,73 @@ "%e será reemplazado por el nombre del archivo actual sin extencion, ej. " "prueba" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Selecciona Inclusiones y Argumentos" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Configure los comandos para construir y ejecutar programas." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "comandos de %s" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Compilar:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Construir:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Ejecución:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Compilar el archivo actual" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make Objetivo Personalizado" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Ingresar opciones personalizadas aquí, todo el texto ingresado es pasado a " "la herramienta make" -#: ../src/build.c:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Compilar el archivo actual con Make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Fallo al ejecutar el programa visualizador" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "El proceso no pudo ser detenido (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "No hay más errores de construción." @@ -318,8 +318,8 @@ msgid "Do you really want to quit?" msgstr "¿Realmente desea salir?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Recargar" @@ -332,54 +332,54 @@ msgid "Are you sure you want to reload '%s'?" msgstr "¿Está seguro que quiere recargar '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Ir a la Línea" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Ingrese la línea a la que quiere ir:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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." -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../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:1479 ../src/ui_utils.c:560 +#: ../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:1481 ../src/ui_utils.c:561 +#: ../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:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Usar Formato de Fecha Personalizado" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Formato de Fecha Personalizado" -#: ../src/callbacks.c:1495 +#: ../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." @@ -388,26 +388,26 @@ "especificador de conversión que pueda ser usado con la función strftime de " "ANSI C." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "" "El formato de fecha no pudo ser convertido (probablemente sea demasiado " "largo)." -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "No hay más items de mensajes." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Abrir archivo" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Ver" -#: ../src/dialogs.c:150 +#: ../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." @@ -415,28 +415,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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Detectar por extensión de archivo " -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Detectar desde archivo" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "_Más Opciones" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Mostrar archivos _ocultos" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Elegir _codificación:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -451,11 +451,11 @@ "codificación seleccionada." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Seleccionar tipo de archivo:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -467,23 +467,32 @@ "Notar que si se seleccionan múltiples archivos todos serán abiertos como el " "tipo seleccionado" -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "S_obrescribir" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Guardar Archivo" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "R_enombrar" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Guardar el archivo y renombrarlo" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Abrir el archivo en una nueva pestaña" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -491,24 +500,41 @@ "Mantener el documento actual (no guardado) abierto y abrir el archivo nuevo " "guardado en una nueva pestaña." -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Error" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Pregunta" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Advertencia" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Información" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_No guardar" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "El archivo '%s' no fue guardado." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "¿Quiere guardarlo antes de cerrar?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Elegir fuente" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -516,106 +542,106 @@ "Ocurrió un error o no se pudo obtener información de un archivo (ej. de un " "archivo nuevo)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "desconocido" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Propiedades" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Tipo:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Tamaño:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Ubicación:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Sólo Lectura:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(sólo dentro de Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Codificación" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(con BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(sin BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Modificado:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Cambiado:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Accedido:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Permisos" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Lectura:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Escritura:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Dueño:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Grupo:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Otros:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "El archivo %s fue cerrado." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Nuevo archivo \"%s\" abierto." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "No se pudo abrir el archivo %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -630,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:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "El archivo \"%s\" no es %s válido." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -643,48 +669,51 @@ msgstr "" "El archivo \"%s\" no aparenta ser de texto o la codificación no es soportada" -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Espacios" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabulaciones" -#: ../src/document.c:1174 +#: ../src/document.c:1128 msgid "Tabs and Spaces" msgstr "Tabulados y Espacios" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Estableciendo modo de indentado %s para %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Nombre de archivo invalido" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Archivo %s recargado." -#: ../src/document.c:1354 +#. 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 "Archivo %s abierto(%d%s)" -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", sólo lectura" -#: ../src/document.c:1561 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Error al renombrar el archivo." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -693,7 +722,7 @@ "Ocurrió un error mientras se convertía el archivo desde UTF-8 en \"%s\". El " "archivo no fue guardado.n" -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -702,52 +731,52 @@ "Mensaje de error: %s\n" "El error ocurrió en \"%s\" (linea: %d, columna: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Mensaje de error: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Error guardando archivo." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Error guardando archivo (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Archivo %s guardado." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "no se encontró \"%s\"." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Volver al principio y buscar de nuevo?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "No se encontraron coincidencias para \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: se reemplazó %d ocurrencia de \"%s\" con \"%s\"." msgstr[1] "%s: se reemplazaron %d ocurrencias de \"%s\" con \"%s\"." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "¿Quiere recargarlo?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -756,32 +785,20 @@ "El archivo '%s' del disco es más reciente\n" "que la vista actual." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "¿Intentar volver a salvar el archivo?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "No se encontró el archivo \"%s\"!" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Introduzca el Ancho de Tabulación:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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 " @@ -884,133 +901,122 @@ msgstr "Chino 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:141 ../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" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Sin _codificación" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "Europeo del _Oeste" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "Europeo del _Este" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Este _Asiático" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_SE & SO Asiático" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Cercano Oriente" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Ninguno" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Archivo de fuente %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "Archivo de fuente %s" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Ninguno" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Archivo de guiones shell" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Documento XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Hojas de estilo en cascada (CSS)" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "Archivo de volcado SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Archivo diff" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Archivo de configuración" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Archivo de traducción Gettext" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "Archivo de script %s" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Archivo de reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Lenguajes de _Programación" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Lenguajes de _Scripts" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Lenguajes de _Etiquetas" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Lenguajes M_isceláneos" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Todo codigo fuente" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Todos los archivos" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expresión regular incorrecta para el tipo de archivo %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "sin título" @@ -1024,8 +1030,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "invisible" @@ -1033,7 +1039,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Abrir Archivo Selecc_ionado" @@ -1053,11 +1059,11 @@ msgid "Page Set_up" msgstr "_Configuración de Página" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Cerrar los o_tros documentos" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "C_errar Todo" @@ -1065,83 +1071,79 @@ msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Seleccionar _todo" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Formato" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "C_onvertir mayúsculas/minúsculas de la Selección" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Comentar Línea(s)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "_Descomentar Línea(s)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Comen_tar/Descomentar" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "Du_plicar Línea o Selección" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "_Incrementar sangría" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "_Decrementar sangría" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "Mandar _Selección al Terminal" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "Mandar _Selección a" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "I_nsertar Comentarios" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Insertar Entrada de _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Insertar _Encabezado de Archivo" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Insertar Descripción de _Función" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Insertar Comentario _Multilínea" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Insertar aviso de licencia _GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Insertar aviso de licencia _BSD" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Insertar F_echa" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "_Insertar \"include <...>\"" @@ -1165,7 +1167,7 @@ msgid "Find in F_iles" msgstr "Buscar en Arch_ivos" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Reemplazar" @@ -1185,7 +1187,7 @@ msgid "Pr_evious Message" msgstr "Mensaje Anterior" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "_Ir a la Línea" @@ -1213,7 +1215,7 @@ msgid "Show Side_bar" msgstr "Mostrar _Barra lateral" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1257,15 +1259,15 @@ msgid "In_dent Type" msgstr "Tipo _de formateo" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tabulaciones" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "E_spacios" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_abulaciones y Espacios" @@ -1385,7 +1387,7 @@ msgid "_Debug Messages" msgstr "Mensajes de depuración" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Símbolos" @@ -1409,71 +1411,77 @@ msgid "Scribble" msgstr "Borrador" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Imágenes _y texto" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Sólo _imágenes" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Sólo _texto" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Iconos _grandes" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Iconos _pequeños" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "Iconos muy _pequeños" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" msgstr "_Ocultar barra de herramientas" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "_Ocultar barra de herramientas" + +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Encontrar _Uso" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Encontrar _Uso del Documento" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Ir a la Definición del _Tag" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Ir a la Declaración del T_ag" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Acción Conte_xtual" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Preferencias" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Cargar archivos de la última sesión" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Abre en el inicio los archivos de la última sesion" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Cargar emulación de terminal virtual" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1481,40 +1489,40 @@ "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:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Activar soporte de complementos" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Guardar la posición de la ventana y su geometría" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Confirmar salida" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Muestra un dialogo de confirmación al momento de salir" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Cerrado" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Ruta de inicio:" -#: ../src/interface.c:2758 +#: ../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." @@ -1522,19 +1530,19 @@ "Ruta a 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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Archivos del proyecto:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Ruta a iniciar cuando se abran archivos de proyectos" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Ruta para complementos extra:" -#: ../src/interface.c:2808 +#: ../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 " @@ -1544,19 +1552,19 @@ "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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Rutas" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Inicio" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 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:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1564,11 +1572,11 @@ "Define si se da una advertencia sonora en los errores o al finalizar el " "proceso de compilación." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 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:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1576,11 +1584,11 @@ "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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Suprimir mensajes de estado en la barra de estado" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1588,11 +1596,12 @@ "Remueve todos los mensajes de la barra de estado. Los mensajes son mostrados " "de todas formas en la ventana de mensajes de estado." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Enfocar automáticamente (el foco sigue al ratón)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1602,15 +1611,15 @@ "para el panel de edición principal, el borrador, la barra de búsquedas, el " "campo ir a y la VTE." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Misceláneo" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Siempre dar la vuelta con la búsqueda y ocultar el dialogo de Buscar" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1618,11 +1627,11 @@ "lSiempre dar la vuelta con la búsqueda y ocultar el dialogo de Buscar luego " "de hacer click en Buscar Siguiente/Anterior" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 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" -#: ../src/interface.c:2896 +#: ../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" @@ -1630,20 +1639,20 @@ "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" -#: ../src/interface.c:2898 +#: ../src/interface.c:2918 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" -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Buscar" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Usar archivos de sesión por proyectos" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1651,12 +1660,12 @@ "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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "" "Almacenar el archivo de proyecto dentro del directorio base del proyecto" -#: ../src/interface.c:2929 +#: ../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 " @@ -1668,75 +1677,75 @@ "almacenarse en el directorio superior al directorio base. La ruta del " "proyecto se puede cambiar en el diálogo Nuevo Proyecto." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Proyectos" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Misceláneo" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "General" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Mostrar la lista de símbolos" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Mostrar/ocultar la lista de símbolos" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Mostrar la lista de documentos" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Mostrar/ocultar la lista de documentos" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Barra lateral" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Lista de símbolos:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Ventana de mensajes:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Selecciona la fuente para la ventana de mensajes" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Selecciona la fuente para la lista de símbolos" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Selecciona la fuente del editor" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Fuentes" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Mostrar pestañas del editor" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Mostrar botónes para cerrar" -#: ../src/interface.c:3064 +#: ../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)" @@ -1744,109 +1753,114 @@ "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)" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Ubicación de las pestañas de archivos nuevos:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Izquierda" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Derecha" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "" "Las pestañas de archivos serán ubicadas a la derecha de la lista de pestañas" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Doble click esconde todos los paneles adicionales" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Ejecuta el comando Ver->Mostrar/Esconder todos los paneles adicionales" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Pestañas de edición" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Arriba" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Abajo" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Barra lateral:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Posición de pestañas:" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Mostrar barra de estado" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interfaz" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "M_ostrar Barra de Herramientas" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "_Añadir la Barra de Herramientas al Menú" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 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" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Barra de Herramientas" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Estilo de icono:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Tamaño de icono:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Apariencia" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Mostrar Barra de _Herramientas" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Barra de Herramientas" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Cortado de líneas" -#: ../src/interface.c:3349 +#: ../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 " @@ -1856,11 +1870,11 @@ "siguiente. Nota: esta opción tiene un gran costo en velocidad para " "documentos grandes así que debería ser desactivada en maquinas lentas." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Activar la tecla inicio \"inteligente\"" -#: ../src/interface.c:3354 +#: ../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 " @@ -1875,11 +1889,11 @@ "cursor al principio de la linea actual, independientemente de su posición " "actual." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Desactivar Arrastrar y Soltar (Drag and Drop)" -#: ../src/interface.c:3359 +#: ../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" @@ -1888,19 +1902,19 @@ "forma que no se podrá arrastrar o soltar ninguna selección dentro o hacia " "afuera de la ventana del editor" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Activar plegado" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Define si se activa el plegado de código" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Plegar/desplegar todos los hijos de un punto de plegado" -#: ../src/interface.c:3369 +#: ../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." @@ -1909,11 +1923,11 @@ "comportamiento inverso apretando la tecla Mayús.(Shift) mientras se hace " "click en un símbolo de plegado." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Usar indicadores para mostrar los errores de compilación" -#: ../src/interface.c:3374 +#: ../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" @@ -1921,25 +1935,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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Al crear nueva linea, borrar espacios extra" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Columna de salto de línea:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Marcador para activar/desactivar comentarios" -#: ../src/interface.c:3406 +#: ../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." @@ -1948,68 +1962,68 @@ "de código fuente, y que se utiliza para marcar el comentario como " "establecido." -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Características" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Características" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Modo de formateo de código:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Básico" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Carácter actual" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Coincidiendo con las llaves correspondientes" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Ancho:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "El ancho en caracteres que ocupará una tabulación" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "El ancho en caracteres que ocupará una tabulación" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Utilizar un tabulado por indentación" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 espacios si el indentado total es menor que el ancho de tabulado, de lo " "contrario usar ambos" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Ancho de tabulación en espacios:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2017,50 +2031,51 @@ "Define si detectar, cuando se abre un archivo, el tipo de indentado según el " "contenido del archivo." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Usar la tecla Tabulador para realizar la indentación" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 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" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Sangría" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Indentación" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Completado de construcciones" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 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" -#: ../src/interface.c:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "Completado automático de etiquetas XML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Continuación automática de comentarios de varias líneas" -#: ../src/interface.c:3591 +#: ../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" @@ -2068,11 +2083,11 @@ "Continuar automáticamente comentarios de varias líneas en lenguajes como C, C" "++ y Java cuando se introduce una nueva linea dentro del comentario" -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "Completado automático de simbolos" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2080,95 +2095,108 @@ "Completado automática de símbolos conocidos en archivos abiertos (nombres de " "funciones, variables globales, ...)" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "" + +#: ../src/interface.c:3646 +#, fuzzy +msgid "Drop rest of word on completion" +msgstr "Evitar completado de contrucciones" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Número máximo de sugerencias para nombres de símbolos" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Altura de la lista de completado:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Caracteres a escribir para el completado:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 +#, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" "La cantidad de caracteres que son necesarios para mostrar la lista de " "autocompletado de símbolos" -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +#, fuzzy +msgid "Display height in rows for the autocompletion list" msgstr "Número de líneas a mostrar en la lista de completado automático." -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +#, fuzzy +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" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Paréntesis ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 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:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Comillas simples ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 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:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Llaves { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Cerrar automáticamente llaves al escribir una llave de apertura" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Corchetes [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "Cerrar automáticamente corchetes al escribir un corchete de apertura" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Comillas dobles \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 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:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Cerrar automáticamente comillas y corchetes" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Completados" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Invierte los colores de resaltado de sintaxis" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2176,45 +2204,45 @@ "Usar texto blanco sobre fondo negro e invertir todos los colores, esta " "opción necesita que se reinicie Geany" -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Mostrar guías de formateo automático de código" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Mostrar espacios en blanco" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca los espacios con puntos y las tabulaciones con flechas" -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Mostrar terminaciones de línea" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Muestra el carácter de fin de línea" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Mostrar Números de _Línea" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Muestra u oculta el margen con números de línea" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Muestra el margen de marcas" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2222,38 +2250,38 @@ "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:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Detiene el scroll hacia abajo cuando se alcanza la última línea" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Marcador de líneas largas:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Color del marcador de líneas largas:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Selecciona el color del marcador de líneas largas" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../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 color" -#: ../src/interface.c:3826 +#: ../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 " @@ -2263,11 +2291,11 @@ "a marcar las líneas largas, o como sugerencia para cortarlas. Poner un valor " "mayor a 0 para especificar la columna donde debe aparecer." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Línea" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2275,11 +2303,11 @@ "Imprime una línea vertical en la ventana de edición en la posición dada del " "cursor (ver debajo)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Fondo" -#: ../src/interface.c:3846 +#: ../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 " @@ -2289,57 +2317,57 @@ "cursor (ver más abajo) cambió al color seleccionado abajo. (Esto es " "recomendable si se usan fuentes proporcionales)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Deshabilitado" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Marcador de líneas largas" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Mostrar" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Abrir nuevos documentos desde la línea de comandos" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Caracteres de fin de línea por defecto:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Archivos nuevos" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Codificación por omisión (para archivos nuevos):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Codificación por omisión (para archivos existentes):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Usar una codificación fija al abrir archivos" -#: ../src/interface.c:3978 +#: ../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 " @@ -2349,53 +2377,53 @@ "archivos cuando se está abriendo un archivo y abre el archivo con la " "codificación especificada (esto normalmente no es necesario)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Codificaciones" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Asegurar terminación de línea al final del archivo" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Borrar espacios y tabulaciones al final" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Reemplazar tabulaciones por espacios" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Reemplaza todas las tabulaciones en el documento por espacios" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Guardando archivos" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Longitud de la lista de archivos recientes:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Tiempo de espera para la comprobación en disco" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2403,27 +2431,27 @@ "Frecuencia en segundos para comprobar en el disco los cambios de los " "archivos abiertos. El valor 0 desactiva la comprobación." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Archivos" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Navegador:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Ruta y opciones para la herramienta make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2431,23 +2459,23 @@ "Un emulador de terminal como xterm, gnome-terminal o konsole (debe aceptar " "el argumento -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Ruta (y posiblemente argumentos adicionales) a su navegador favorito" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Rutas a las herramientas" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Acción contextual:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2458,67 +2486,67 @@ "usada con %s. Puede estar en cualquier lugar del comando dado y será " "remplazada antes de la ejecución." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Comandos" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Herramientas" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "dirección de correo electrónico del desarrollador" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Iniciales del nombre del desarrollador" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Version inicial:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Número de version que tiene un archivo nuevo" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Nombre de la compañia" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Desarrollador:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Compañia:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Dirección de correo electrónico:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Iniciales:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "El nombre del desarrollador" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Año:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Fecha:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Fecha y hora:" -#: ../src/interface.c:4382 +#: ../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." @@ -2526,7 +2554,7 @@ "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." -#: ../src/interface.c:4389 +#: ../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." @@ -2534,7 +2562,7 @@ "Ingrese 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:4396 +#: ../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." @@ -2542,64 +2570,64 @@ "Ingrese 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:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Datos de plantillas" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Plantillas" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "_Cambiar" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Atajos de teclado" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Atajos" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Usar un comando externo para la impresión" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Imprimir números de línea" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Añadir números de linea a la página impresa" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Imprimir números de página" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "" "Agregar números de página al final de cada página. Ocupa 2 lineas de la " "página." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Imprimir encabezado de página" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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." @@ -2608,19 +2636,19 @@ "el nombre del archivo y la fecha actual (ver abajo). Ocupa 3 lineas de la " "página." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Usar el nombre del archivo impreso" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Formato de Fecha:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2630,535 +2658,554 @@ "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:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Usar la impresión nativa de GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Impresión" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Propiedades del Proyecto" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Archivo" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nuevo" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Abrir" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Abrir archivos seleccionados" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Guardar" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Guardar Como..." -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Guardar todo" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Imprimir" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Cerrar" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Cerrar todo" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Recargar archivo" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Proyecto" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Propiedades del proyecto" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Deshacer" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Rehacer" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Duplicar línea o selección" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Borrar la(s) linea(s) actual(es)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +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" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Desplazar a la linea actual" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Desplazar la vista hacia arriba una linea" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Desplazar la vista hacia abajo una linea" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Completar construcción" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Mover cursor dentro de un trozo de texto" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Evitar completado de contrucciones" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Acción contextual" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Completar palabra" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Mostrar pistas de prototipos" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Mostrar la lista de macros" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Portapapeles" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Cortar" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Copiar" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Pegar" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Copiar la(s) linea(s) actual(es)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Cortar la(s) linea(s) actual(es)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Seleccionar" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Seleccionar Todo" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Seleccionar palabra actual" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Seleccionar linea(s) actual(es)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Seleccionar parrafo actual" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Formato" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Intercambiar entre Mayúsculas y minúsculas" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Comentar/Descomentar" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Comentar línea(s)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Descomentar línea(s)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Incrementar sangría" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Decrementar sangría" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Incrementar sangría en un espacio" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Decrementar sangría en un espacio" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Sangrado de linea inteligente" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Enviar al Comando Personalizado 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Enviar al Comando Personalizado 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Enviar al Comando Personalizado 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Mandar Selección al Terminal" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Insertar" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Insertar fecha" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Insertar espacio en blanco alternativo" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Opciones" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Buscar" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Encontrar" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Buscar Siguente" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Buscar Anterior" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Buscar Siguiente Selección" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Buscar Anterior Selección" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Reemplazar" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Buscar en Archivos" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Mensaje Siguiente" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Mensaje Previo" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Encontrar uso" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Encontrar Uso de Documento" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "_Make All" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Ir a" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Navegar una ubicación hacia atrás" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Navegar una ubicación hacia adelante" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Ir a la llave correspondiente" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Activar/Desactivar marca" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Ir a la siguiente marca" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Ir a la marca anterior" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Ir a la Definición del Tag" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Ir a la Declaración del Tag" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Ir al Comienzo de la Línea" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Ir al Final de la Línea" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Ir al Final de la Línea" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Ir al anterior fragmento de palabra" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Ir al siguiente fragmento de palabra" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Ver" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Mostrar/Esconder todos los paneles adicionales" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Pantalla completa" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Mostrar ventana de mensajes" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Mostrar/Ocultar barra lateral" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Acercar el texto" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Alejar el texto" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Foco" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Ir al Editor" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Ir al Borrador" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Ir a la VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Ir a la Barra de Busqueda" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Ir a la Barra Lateral " -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Cambiar a Compilador" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Pestaña de anotador" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Ir al documento de la izq." -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Ir al documento de la der." -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Ir al último documento usado" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Mover el documento a la izquierda" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Mover el documento a la derecha" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Mover el documento al principio" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Mover el documento al final" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Activar/Desactivar ajuste de línea" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Activar/Desactivar salto de línea" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Reemplazar espacios por tabulaciones" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Activar/desactivar plegado actual" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Plegar todo" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Desplegar todo" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Recargar lista de símbolos" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Construir" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Compilar" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Construye con make (objetivo personalizado)" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Siguiente error" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Error previo" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Ejecutar" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Ejecutar (comando alternativo)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Opciones de construcción" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Mostrar Selector de Colores" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Ayuda" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Atajos de Teclado" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Los siguientes atajos de teclado son configurables:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Cambiar a Documento" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "Escriba aquí lo que desee, úselo como nota o borrador" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Error al cargar uno o más archivos de la sesión." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Mensajes de depuración" @@ -3217,7 +3264,8 @@ msgstr "Imprimir el prefijo de instalación de Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" +#, fuzzy +msgid "Don't load the previous session's files" msgstr "no cargar los archivos de la sesión anterior" #: ../src/main.c:143 @@ -3232,25 +3280,25 @@ msgid "Show version and exit" msgstr "Mostrar versión y salir" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[ARCHIVOS...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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)" -#: ../src/main.c:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "¿Moverlo ahora?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3261,7 +3309,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3271,7 +3319,7 @@ "\" (%s). Por favor, mueva manualmente su antiguo directorio al nuevo lugar " "correspondiente." -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3282,22 +3330,22 @@ "Puede haber problemas usando Geany sin un directorio de configuración.\n" "¿Iniciar Geany de todas formas?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "No se pudo encontrar el archivo '%s'." -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Este es Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "El directorio de configuración no pudo ser creada (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Archivos de configuración recargados." @@ -3315,7 +3363,7 @@ msgid "_Hide Message Window" msgstr "_Ocultar Ventana de Mensajes" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3324,11 +3372,11 @@ "El complemento \"%s\" no es compatible binariamente con esta distribución de " "Geany - por favor recompilarlo." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "_Administrador de Complementos" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3339,23 +3387,23 @@ "Descripción: %s\n" "Autor(es): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Activo" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Complemento" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "No hay complementos disponibles." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Complementos" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3363,50 +3411,58 @@ "Debajo se encuentra una lista de complementos disponibles. Seleccione los " "complementos que deben ser cargados cuando se inicia Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Detalles del complemente:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Acción" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Atajo" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Capturar Tecla" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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\"." -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "_Expandir Todo" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "_Colapsar Todo" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Acción" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Atajo" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "S_obrescribir" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Sobrescribir ese atajo?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "La combinación '%s' está usada por \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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 " "necesite pueden quedar en blanco." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3414,7 +3470,7 @@ "Especificar la información que quiera usar en las plantillas. Para más " "detalles ver la documentación." -#: ../src/prefs.c:1458 +#: ../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." @@ -3425,7 +3481,7 @@ ">Recargar Configuración." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3437,7 +3493,7 @@ "el atajo." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3446,18 +3502,8 @@ "compilado con GTK 2.10 (o superior) y Geany está corriendo con GTK " "2.10 (o superior)." -#. page Toolbar -#: ../src/prefs.c:1475 -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." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3465,46 +3511,54 @@ "Advertencia: Estos ajustes son invalidados por el proyecto actual. " "Consulte Proyecto->Propiedades." -#: ../src/printing.c:270 +#: ../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:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Configuración del Documento" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "La impresión de %s fue cancelada." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Archivo %s impreso." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "La impresión de %s ha fallado (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 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" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3515,7 +3569,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "La impresión de \"%s\" ha fallado (código de retorno: %s)." @@ -3534,19 +3588,19 @@ msgid "C_reate" msgstr "C_rear" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nombre:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Nombre de Archivo:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Ruta base:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3556,41 +3610,41 @@ "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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Elija la Ruta Base del Proyecto" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "El archivo de proyecto \"%s\" no pudo ser cargado." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Abrir Proyecto" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Archivos del proyecto" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Proyecto \"%s\" cerrado." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Descripción:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Make en el directorio base" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Comando de ejecución:" -#: ../src/project.c:457 +#: ../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." @@ -3598,82 +3652,82 @@ "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." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Patrones de archivos:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "¿Quiere cerrarlo antes de proceder?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "El proyecto '%s' ya está abierto. " -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "El nombre de proyecto especificado es muy corto." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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)." -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Ha especificado un nombre de archivo de proyecto inválido." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "¿Crear el directorio de la ruta base del proyecto?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "La ruta \"%s\" no existe." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "No se pudo crear el directorio base del proyecto (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "El archivo de proyecto no pudo ser escrito (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Proyecto \"%s\" creado." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Proyecto \"%s\" guardado." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Elija el Nombre del archivo de Proyecto" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Elija el Comando de Ejecución del Proyecto" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Proyecto \"%s\" abierto." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "_Usar expresiones regulares" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3681,15 +3735,15 @@ "Usar expresiones regulares estilo-POSIX. Por información detallada sobre el " "uso de expresiones regulares, por favor lea la documentación" -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Buscar hacia _atras" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Usar secuencias de _escape" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3697,403 +3751,413 @@ "Reemplaza \\\\, \\t, \\n, \\r y \\uXXXX (caracteres Unicode) con el carácter " "de control correspondiente" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "_Respetar Mayúsculas y minúsculas" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Sólo _palabras enteras" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Sólo desde el principio de las _palabras" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Anterior" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Siguente" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Buscar por:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "Buscar _Todos" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Marcar" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Marcar todas las coincidencias en el documento actual" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "En la _Sesión" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "En el _Documento" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Cerrar _dialogo" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Deshabilite esta opción para mantener el dialogo abierto" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Reemplazar y B_uscar" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Reem_plazar con:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Reemplazar _Todo" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "En la Se_lección" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "" "Reemplaza todas las ocurrencias encontradas en el texto actualmente " "seleccionado" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Directorio:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "_Codificación:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Cadenas _fijas" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Expresiones regulares _Grep" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "Véase la página de manual de grep para más información" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "Expresiones regulares _Extendidas" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Operar _Recursivamente en los subdirectorios" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Invertir los resultados de la búsqueda" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Invierte el sentido de la asociación, seleccionando las líneas no " "coincidentes." -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Opciónes e_xtra:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Otras opciones a pasar a Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "Se encontró %d coincidencia para \"%s\"." msgstr[1] "Se encontraron %d coincidencias para \"%s\"." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Directorio no válido para buscar archivos." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "No hay texto para buscar." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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." -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Buscando..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (en directorio: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "No se pudo abrir el directorio (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "No se encontraron coincidencias." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Capítulo" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Sección" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sec1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sec2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sec3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Apéndice" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Otro" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Módulo" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Tipos" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Constructores de tipos" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Funciones" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Secciónes" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Teclas" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Variables" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Comando" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Entorno" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Sub-sección" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Sub-sub-sección" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Etiqueta" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Estructuras" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Paquete" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Mi" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Nuestro" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Clases" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Constantes" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Anclas" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Encabezados (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Encabezados (H2)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Encabezados (H3)" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "Selectores de ID" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Selectores de Tipo" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Módulos" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Métodos" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Namespaces" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Propiedades" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Exportar" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Miembros" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Etiquetas" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Subrutinas" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Bloques" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Defines" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Objetivos" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Namespaces" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Extención de archivo desconocide para \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4102,7 +4166,7 @@ "Uso: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4113,169 +4177,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Cargar Tags" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Archivos de tags de Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Cargado %s archivo de tags '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "No se pudo cargar el archivo de tags '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Declaración de \"%s\" no encontrada" -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definición de \"%s\" no encontrada" -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "_Expandir Todo" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "_Colapsar Todo" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Ordenar por _Nombre" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Ordenar por _Aparición" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Guardar el archivo actual" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Guardar _Todo" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Guardar todos los archivos abiertos" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Recarga el archivo actual desde el disco" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Cerrar el archivo actual" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Cerrar todos los archivos abiertos" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Cortar la selección actual" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Copiar la selección actual" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Pega los contenidos del portapapeles" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Eliminar la selección actual" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Deshacer la última modificación" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Rehacer la última modificación" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Compilar el archivo actual" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Ejecutar o ver el archivo actual" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 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" -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Acercar el texto" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Alejar el texto" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Decrementar sangría" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Incrementar sangría" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Buscar el texto ingresado en el archivo actual" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Saltar al número de línea introducido" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Muestra el diálogo Preferencias" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Salir de Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Imprimir documento" -#: ../src/toolbar.c:153 -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." +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Marcar todas las coincidencias en el documento actual" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Crear un archivo nuevo" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Abrir un archivo existente" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Ir a" +#: ../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 "Mostrar" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4343,123 +4416,144 @@ msgid "Characters:" msgstr "Caracteres:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "No se encontraron tags" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Mostrar la lista de _símbolos" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Mostrar la Lista de _Documentos" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "_Ocultar barra lateral" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Mostrar la ruta _completa" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "SL" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "SOB" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "ES" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/E" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "modo: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "codificación: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "Tipo de archivo: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "alcance: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Fuente actualizada (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Biblioteca Estandard de C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Biblioteca Estandard de C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Biblioteca Estandard de C++" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Configurar Formato de Fecha Personalizado" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Seleccionar Carpeta" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Seleccionar Archivo" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Archivos de C_onfiguración" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Guardar _Todo" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "C_errar Todo" +#: ../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 "Terminal" @@ -4633,161 +4727,145 @@ "terminal. Por favor, obsérvese que los programas ejecutados en la VTE no " "pueden ser detenidos." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Archivos de proyectos Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Ejecutables" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Error" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Pregunta" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Advertencia" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Información" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Constructor de clases" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Crea archivos fuente para nuevas clases." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Crear Clase" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Clase" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Nombre de clase:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Archivo de encabezado:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Archivo de fuente:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Herencia" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Clase base:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Encabezado base:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Gtype base:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Opciones" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Crear constructor" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Crear destructor" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Constructor de tipo GTK+ " -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Crear Cla_se" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "Clase _C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "Clase _GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caracteres HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Insertar entidades HTML para carácteras como '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "El equipo de desarrollo de Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Caracteres HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Caracteres ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Caracteres griegos" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Caracteres matemáticos" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Caracteres técnicos" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Caracteres de flechas" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Caracteres de puntuación" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Caracteres misceláneos" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Caracteres especiales" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Insertar" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4795,157 +4873,157 @@ "Elija un carácter especial de la lista de abajo y haga doble click en él o " "use el botón para insertarlo en la posición actual del cursor." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Carácter" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (nombre)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_Insertar Caracteres Especiales de HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "Reemplazo HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "Activar / Desactivar HTML" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Reemplazo masivo de caracteres especiales" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Insertar Caracteres Especiales HTML" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Reemplazar caracteres especiales" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Activar/Desactivar estado del complemento" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Exportar" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exporta el archivo actual en diferentes formatos." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Exportar archivo" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Usar el nivel actual de acercamiento/alejamiento" -#: ../plugins/export.c:193 +#: ../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." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Documento exportado exitosamente como '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "El archivo '%s' no pudo ser escrito (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "El archivo '%s' ya existe. ¿Quiere sobreescribirlo?" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Exportar" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Como _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Como _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Navegador de Archivos:" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Agrega una pestaña de navegación de archivos al panel lateral." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "¡Demasiados items seleccionados!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "No se pudo ejeutar el comando externo configurado '%s' (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Abrir _externamente" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Buscar en Archivos" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Mostrar Archivos _Ocultos" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Arriba" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Refrescar" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Inicio" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Tomar ruta del documento" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Borrar el filtro" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filtro:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Enfocar la Lista de Archivos" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Enfocar Entrada de Ruta" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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." @@ -4984,7 +5062,8 @@ "*.obj. *.so, *.dll, *.a, *.lib" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" +#, fuzzy +msgid "Use the project's base directory" msgstr "Establece el directorio base del proyecto" #: ../plugins/filebrowser.c:1132 @@ -4993,33 +5072,33 @@ msgstr "" "Cambia el directorio al directorio base del proyecto abierto actualmente" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Guardar Acciones" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" "Este complemento proporciona distintas acciones relacionadas con el guardado " "de ficheros." -#: ../plugins/saveactions.c:177 +#: ../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)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../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)." -#: ../plugins/saveactions.c:227 +#: ../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)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5027,107 +5106,139 @@ msgstr[1] "Autoguardado: Guardados %d archivos automáticamente." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Seleccionar directorio" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "" "El directorio para la copia de seguridad no existe o no se puede escribir en " "él." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Auto Guardar" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Activar" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "Intervalo de autoguardado:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "segundos" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "Im_primir mensaje de estado si se guardaron archivos automáticamente" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Guardar sólo el archivo abierto actualmente" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Guardar todos los archivos abiertos" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Guardado instantáneo" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "_Tipo de archivo a emplear para nuevos archivos creados:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Copia de Seguridad" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Directorio para guardar las copias de seguridad" -#: ../plugins/saveactions.c:686 +#: ../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\"):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "_Niveles de directorio a incluir en la copia de seguridad de destino:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Dividir ventana" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Divide la vista del editor en dos ventanas" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Marcar todas las coincidencias en el documento actual" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Unificar" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Dividir ventana" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Horizontalmente" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Verticalmente" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Dividir Horizontalmente" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Dividir Verticalmente" -#: ../plugins/splitwindow.c:426 +#: ../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)" @@ -5396,9 +5507,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Structs / Typedefs" -#~ msgid "Show _Full Path Name" -#~ msgstr "Mostrar la ruta _completa" - #~ msgid "Terminal emulation:" #~ msgstr "Emulación de terminal:" @@ -5592,9 +5700,6 @@ #~ msgid "Complete construct" #~ msgstr "Completar contrucción" -#~ msgid "Suppress construct completion" -#~ msgstr "Evitar completado de contrucciones" - #~ msgid "Go to tag definition" #~ msgstr "Ir a la definición del tag" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/fi.po /tmp/ssBwSf4GIv/geany-0.18/po/fi.po --- geany-0.17/po/fi.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/fi.po 2009-08-16 17:18:28.000000000 +0100 @@ -1,16 +1,16 @@ # Finnish translations for geany. # Copyright (C) 2007-2009 geany's development team. # This file is distributed under the same license as the geany package. -# Harri Koskinen , 2007-2008. +# Harri Koskinen , 2007-2009. # Jari Rahkonen , 2009. # msgid "" msgstr "" -"Project-Id-Version: Geany 0.16\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" -"PO-Revision-Date: 2009-03-03 22:06+0200\n" -"Last-Translator: Jari Rahkonen \n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"PO-Revision-Date: 2009-08-13 15:48+0200\n" +"Last-Translator: Harri Koskinen \n" "Language-Team: Finnish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,75 +32,75 @@ msgid "Integrated Development Environment" msgstr "Integroitu ohjelmointiympäristö" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Tietoja Geanystä" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Nopea ja kevyt ohjelmointiympäristö" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Tietoja" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Kehittäjät" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "ylläpitäjä" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "kehittäjä" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "käännösten ylläpitäjä" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Kääntäjät" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" -msgstr "Aikaisemmat Kääntäjät" +msgstr "Aikaisemmat kääntäjät" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Avustavat kehittäjät" -#: ../src/about.c:340 +#: ../src/about.c:342 #, 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Tekijät" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Lisenssi" -#: ../src/about.c:389 +#: ../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 "" -"Lisenssitekstin sisältävää tiedostoa ei löydetty. Voit lukea lisenssin " +"Lisenssitekstin sisältävää tiedostoa ei löytynyt. Voit lukea lisenssin " "osoitteessa http://www.gnu.org/licenses/gpl-2.0.txt" -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -108,133 +108,133 @@ msgstr "" "Pääteohjelmaa \"%s\" ei löytynyt. Tarkista päätteen polku geanyn asetuksista." -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Prosessi epäonnistui (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (kansiossa %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Työkansion vaihto kansioon \"%s\" epäonnistui." -#: ../src/build.c:731 +#: ../src/build.c:707 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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Käännös epäonnistui." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Käännös onnistui." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Käännä" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Koosta _mukautettu kohde" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Koosta o_lio" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Seu_raava virhe" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "_Edellinen virhe" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../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:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "Näytä _DVI-tiedosto" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "Näytä _PDF-tiedosto" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Aseta valitsimet" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Aseta valitsimet" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "DVI:n luominen:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "PDF:n luominen:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "DVI:n esikatselu:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "PDF:n esikatselu:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -243,67 +243,67 @@ "%f korvataan nykyisellä tiedostonimellä, esim. tiedosto.c\n" "%e korvataan tiedostonimellä ilman päätettä, esim. tiedosto" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Sisällytettävät tiedostot ja valitsimet" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Aseta ohjelmien koostamis- ja suorituskomennot." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s komennot" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Käännä:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Koosta:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Suorita:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Käännä nykyinen tiedosto" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Koosta valinnainen kohde" -#: ../src/build.c:1927 +#: ../src/build.c:1918 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." -#: ../src/build.c:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Käännä nykyinen tiedosto make-komennolla" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Katseluohjelman suoritus epäonnistui" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Prosessin (%s) pysäytys epäonnistui." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Kääntövirheitä ei ole enempää." @@ -311,8 +311,8 @@ msgid "Do you really want to quit?" msgstr "Haluatko varmasti sulkea sovelluksen?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Lataa uudelleen" @@ -325,52 +325,52 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Haluatko varmasti ladata tiedoston \"%s\" uudelleen?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Siirry riville" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Syötä rivinumero, jolle haluat siirtyä:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "pp.kk.vvvv" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "kk.pp.vvvv" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "vvvv/kk/pp" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "pp.kk.vvvv tt:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "kk.pp.vvvv tt:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "vvvv/kk/pp tt:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Mukautettu päivämäärän muoto" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Mukautettu päivämäärän muoto" -#: ../src/callbacks.c:1495 +#: ../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." @@ -378,26 +378,26 @@ "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:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Ei muita viestejä." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Avaa tiedosto" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Näytä" -#: ../src/dialogs.c:150 +#: ../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." @@ -405,29 +405,28 @@ "Avaa tiedoston ilman kirjoitusoikeuksia. Jos valitset useita tiedostoja, ne " "kaikki avataan ilman kirjoitusoikeuksia." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Tunnista päätteen perusteella" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Tunnista tiedostosta" -#: ../src/dialogs.c:259 -#, fuzzy +#: ../src/dialogs.c:258 msgid "_More Options" -msgstr "Valinnat" +msgstr "_Lisävalinnat" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "_Näytä piilotiedostot" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Aseta merkistö:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -440,11 +439,11 @@ "Jos valitset useita tiedostoja, ne kaikki avataan käyttäen samaa merkistöä." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Aseta tiedostotyyppi:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -455,23 +454,31 @@ "perusteella.\n" "Jos valitset useita tiedostoja, tyyppimääritys koskee niitä kaikkia." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Korvaa?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Tiedoston nimi on jo olemassa!" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Tallenna tiedosto" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "_Nimeä uudelleen" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Tallenna tiedosto ja nimeä se uudelleen" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Avaa tiedosto uuteen välilehteen" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -479,24 +486,41 @@ "Pidä nykyinen asiakirja avoinna ja avaa tallennettu tiedosto uuteen " "välilehteen" -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Virhe" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Kysymys" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Varoitus" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Tietoa" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Älä tallenna" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Tiedostoa \"%s\" ei ole tallennettu." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Tallennetaanko tiedosto ennen sulkemista?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Valitse kirjasin" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -504,106 +528,106 @@ "Tapahtui virhe tai tiedoston tietoja ei voitu hakea (esim. uudesta " "tiedostosta)" -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "tuntematon" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Ominaisuudet" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Tyyppi:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Koko:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Sijainti:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Vain luku:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(vain Geanyn sisällä)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Merkistö:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(BOM-merkintä)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(ei BOM-merkintää)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Muokattu:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Muutettu:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Käytetty:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Oikeudet:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Luku:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Kirjoitus:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Omistaja:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Ryhmä:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Muu:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Tiedosto %s suljettu." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Uusi tiedosto \"%s\" avattu." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Tiedoston %s avaaminen epäonnistui (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -617,12 +641,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Tiedoston \"%s\" merkistö ei ole %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -630,49 +654,51 @@ msgstr "" "Tiedosto \"%s\" ei ole tekstitiedosto tai käytettyä merkistöä ei tueta." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Välilyönnit" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Sarkaimet" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Asetetaan sisennystila %s tiedostolle %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Tiedostonimi ei kelpaa" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Tiedosto %s ladattu uudelleen." -#: ../src/document.c:1354 +#. 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 "Tiedosto %s avattu (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", kirjoitussuojattu" -#: ../src/document.c:1561 -#, fuzzy +#: ../src/document.c:1512 msgid "Error renaming file." -msgstr "Tiedoston tallennusvirhe." +msgstr "Tiedostonimen muutosvirhe." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -681,7 +707,7 @@ "Virhe muunnettaessa tiedostoa merkistöstä UTF-8 (%s). Tiedostoa ei " "tallennettu." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -690,52 +716,52 @@ "Virheilmoitus: %s\n" "Tiedostossa \"%s\" (rivi %d, merkki %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Virheilmoitus: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Tiedoston tallennusvirhe." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Tiedoston tallennusvirhe (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Tiedosto %s tallennettu." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" ei löytynyt." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Jatketaanko etsintää tiedoston alusta?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Osumia ei löytynyt: \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: %d \"%s\" korvattiin merkkijonolla \"%s\"." -msgstr[1] "%s: %d \"%s\" korvattiin merkkijonolla \"%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:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Ladataanko uudelleen?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -744,32 +770,20 @@ "Levyllä oleva tiedosto \"%s\" on uudempi kuin\n" "Geanyn muistissa oleva." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Yritetäänkö tallentaa uudelleen?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Tiedostoa \"%s\" ei löytynyt!" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Sarkaimen leveys" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Montako peräkkäistä välilyöntiä korvataan sarkaimella." @@ -870,133 +884,122 @@ msgstr "Kiinalainen, perinteinen" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japanilainen" -#: ../src/encodings.c:141 ../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 "Korealainen" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Ei merkistöä" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Länsieurooppalainen" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Itäeurooppalainen" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Itä_aasialainen" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_Kaakkois- ja lounaisaasialainen" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "Itä_mainen" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Ei mitään" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s-lähdekoodi" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "%s tiedosto" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Ei mitään" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Komentotiedosto" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML-dokumentti" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "CSS-tyylisivu" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL-vedos" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff-tiedosto" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Asetustiedosto" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext-käännöstiedosto" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s-komentotiedosto" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStructuredText-tiedosto" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "_Ohjelmointikielet" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "_Tulkattavat kielet" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "_Kuvauskielet" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "S_ekalaiset kielet" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Kaikki lähdekoodi" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Kaikki tiedostot" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Lauseke ei kelpaa tiedostotyypille %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "nimetön" @@ -1010,16 +1013,16 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../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 "" +msgstr "dummy" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Avaa val_ittu tiedosto" @@ -1039,11 +1042,11 @@ msgid "Page Set_up" msgstr "Sivun as_etukset" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Sul_je muut tiedostot" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "S_ulje kaikki" @@ -1051,83 +1054,79 @@ msgid "_Edit" msgstr "_Muokkaa" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "_Valitse kaikki" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "Mu_otoile" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Vai_hda valinnan tekstikokoa" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Rivi(t) kommentiksi" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "_Poista kommentointi" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "_Aseta/poista kommentointi" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "_Kasvata sisennystä" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "_Vähennä sisennystä" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "_Lähetä valinta päätteeseen" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Lähetä valinta" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Lisää ko_mmentti" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Lisää _ChangeLog-merkintä" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Lisää _ylätunniste" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Lisää _funktion kuvaus" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Lisää usean _rivin kommentti" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Lisää _GPL-lisenssimerkintä" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Lisää _BSD-lisenssimerkintä" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Lisää _päivämäärä" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Lisää \"in_clude <...>\"" @@ -1151,7 +1150,7 @@ msgid "Find in F_iles" msgstr "Etsi tied_ostoista" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Ko_rvaa" @@ -1171,7 +1170,7 @@ msgid "Pr_evious Message" msgstr "Ede_llinen viesti" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Siirr_y riville" @@ -1199,7 +1198,7 @@ msgid "Show Side_bar" msgstr "Näytä _sivupalkki" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editori" @@ -1243,15 +1242,15 @@ msgid "In_dent Type" msgstr "Sis_ennystyyppi" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Sarkaimet" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Välilyönnit" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "_Sarkaimet ja välilyönnit" @@ -1328,9 +1327,8 @@ msgstr "_Avaa" #: ../src/interface.c:955 -#, fuzzy msgid "_Recent Projects" -msgstr "Avaa projekti" +msgstr "_Viimeisimmät projektit" #: ../src/interface.c:959 msgid "_Close" @@ -1372,7 +1370,7 @@ msgid "_Debug Messages" msgstr "_Vianetsintäviestit" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Symbolit" @@ -1396,72 +1394,75 @@ msgid "Scribble" msgstr "Muistilappu" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Kuvat j_a teksti" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Vain _kuvat" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Vain _teksti" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "_Suuret kuvakkeet" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "_Pienet kuvakkeet" -#: ../src/interface.c:1760 ../src/interface.c:3306 -#, fuzzy +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" -msgstr "_Pienet kuvakkeet" +msgstr "_Erittäin pienet kuvakkeet" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "_Muokkaa työkalupalkkia" + +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" msgstr "_Piilota työkalupalkki" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "_Etsi avoimista" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "_Etsi asiakirjasta" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Näytä t_unnisteen määritys" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Näytä tu_nnisteen esittely" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "_Kontekstitoiminto" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Asetukset" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Lataa edellisen istunnon tiedostot" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Avaa edellisen istunnon tiedostot käynnistäessä" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Lataa virtuaalipäätteen tuki" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1469,39 +1470,39 @@ "Ladataanko virtuaalipääte (VTE) käynnistyksen yhteydessä. Poista valinta, " "jollet sitä tarvitse." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Ota liitännäistuki käyttöön" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Käynnistys" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Muista ikkunan sijainti ja koko" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Vahvista ohjelman sulkeminen" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Varmistaa poistuessa, että sovelluksen saa sulkea" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Sulkeminen" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Oletuspolku:" -#: ../src/interface.c:2758 +#: ../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." @@ -1510,39 +1511,40 @@ "täytyy olla täydellinen. Jätä tyhjäksi, jos haluat käyttää polkuna nykyistä " "työkansiota." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Projektitiedostot:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Oletuskansio, kun avataan projektitiedostoja" -#: ../src/interface.c:2796 -#, fuzzy +#: ../src/interface.c:2816 msgid "Extra plugin path:" -msgstr "Ota liitännäistuki käyttöön" +msgstr "Lisäpolku liitännäisille:" -#: ../src/interface.c:2808 +#: ../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 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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Polut" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Käynnistys" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Äänimerkki käännöksen valmistuessa ja virhetilanteissa" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1550,11 +1552,11 @@ "Jos valitset tämän, sovellus ilmoittaa käännöksen valmistumisesta ja " "virhetilanteista äänimerkillä." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Tuo tilaviestit näkyviin uuden viestin tullessa" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1562,11 +1564,11 @@ "Näytä tilaviestivälilehti (ikkunan alareunan välilehtinäkymässä) uuden " "tilaviestin saapuessa" -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Älä näytä tilaviestejä tilapalkissa" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1574,11 +1576,11 @@ "Piilottaa kaikki viestit tilapalkista. Viestit näytetään kuitenkin " "tilaviestiruudussa." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" -msgstr "Kohdista automaattisesti (kohdistus seuraa hiirtä)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" +msgstr "Kohdista widgetit automaattisesti (kohdistus seuraa hiirtä)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1588,15 +1590,15 @@ "muokkausruudussa, muistilapulla, työkalupalkin haku- ja siirry riville -" "kentissä sekä virtuaalipäätteessä." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Muut" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Jatka aina etsintää tiedoston alusta ja piilota hakuikkuna" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1604,11 +1606,11 @@ "Jatka etsintää aina tiedoston alusta ja piilota hakuikkuna, kun käyttäjä " "napsauttaa \"Etsi seuraava/edellinen\"" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "Siirrä kohdistimen alla oleva sana hakukenttään" -#: ../src/interface.c:2896 +#: ../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" @@ -1616,19 +1618,19 @@ "Esitäytä kohdistimen alla oleva sana Etsi-, Korvaa- tai Etsi tiedostoista -" "ikkunan hakukenttään kun valintaa ei ole." -#: ../src/interface.c:2898 +#: ../src/interface.c:2918 msgid "Use the current file's directory for Find in Files" -msgstr "\"Etsi tiedostoista\" etsii nykyisen tiedoston hakemistosta." +msgstr "\"Etsi tiedostoista\" etsii nykyisen tiedoston kansiosta." -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Haku" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Käytä projektikohtaisia istuntotiedostoja" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1636,92 +1638,91 @@ "Määrittää, tallennetaanko projekteille istuntotiedostot, ja avataanko ne " "projektin mukana." -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Tallenna projektitiedosto projektin pääkansioon" -#: ../src/interface.c:2929 -#, fuzzy +#: ../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 "" -"Jos valitset tämän, projektitiedosto tallennetaan uusissa projekteissa " -"oletusarvoisesti projektin pääkansioon. Muussa tapauksessa tiedosto " -"tallennetaan kansioon, jossa projektin pääkansio sijaitsee. Ei estä " -"tiedoston polun vaihtamista Uusi projekti -ikkunassa." +"Jos valitset tämän, projektitiedosto tallennetaan oletusarvoisesti projektin " +"pääkansioon. Muussa tapauksessa tiedosto tallennetaan kansioon, jossa " +"projektin pääkansio sijaitsee. Tiedostopolun voi tästä asetuksesta " +"riippumatta vaihtaa Uusi projekti -ikkunassa." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projektit" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Muut" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Yleiset" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Näytä symboliluettelo" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Määrittää, näytetäänkö symboluettelo" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Näytä asiakirjaluettelo" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Määrittää, näytetäänkö asiakirjaluettelo" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Sivupalkki" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Symboluettelo:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Viesti-ikkuna:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editori:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Asettaa viesti-ikkunan kirjasimen" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Asettaa symbolilistan kirjasimen" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Asettaa editorin kirjasimen" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Kirjasimet" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Näytä editorin välilehdet" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Näytä sulkemispainikkeet" -#: ../src/interface.c:3064 +#: ../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)" @@ -1729,106 +1730,109 @@ "Näyttää tiedostovälilehdissä pienen rastipainikkeen, joka sulkee tiedoston. " "Vaatii uudelleenkäynnistyksen." -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Uusien välilehtien sijainti:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Vasen" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "Uudet tiedostovälilehdet lisätään vasempaan reunaan" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Oikea" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "Uudet tiedostovälilehdet lisätään oikeaan reunaan" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Kaksoisnapsautus piilottaa käyttöliittymän lisäkomponentit" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Suorittaa Näytä->Näytä/Piilota lisäkomponentit -valinnan" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Editorin välilehdet" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Ylhäällä" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Alhaalla" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Sivupalkki:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Välilehtien sijainnit" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Näytä tilapalkki" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Käyttöliittymä" -#: ../src/interface.c:3222 -#, fuzzy +#: ../src/interface.c:3242 msgid "Show T_oolbar" -msgstr "Näytä työkalupalkki" +msgstr "Näytä työ_kalupalkki" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" -msgstr "" +msgstr "_Työkalupalkki valikon vierellä" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" +msgstr "Siirrä työkalupalkki päävalikon viereen säästääksesi pystytilaa" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Työkalupalkki" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Kuvaketyyli:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Kuvakekoko:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Ulkoasu" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "Muokkaa työkalupalkkia" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Työkalupalkki" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Rivitys" -#: ../src/interface.c:3349 +#: ../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 " @@ -1837,11 +1841,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:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Home-näppäin on \"älykäs\"" -#: ../src/interface.c:3354 +#: ../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 " @@ -1854,11 +1858,11 @@ "alkuun. Muussa tapauksessa kohdistin siirretään aina rivin alkuun " "riippumatta sen sijainnista." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Estä valintojen raahaaminen" -#: ../src/interface.c:3359 +#: ../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" @@ -1866,20 +1870,19 @@ "Poista käytöstä tekstin raahaaminen ja pudottaminen editori-ikkunaan tai " "siitä pois" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Salli supistaminen" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Määrittää, voiko ohjelmakoodin osia supistaa" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Supista/Laajenna rekursiivisesti" -#: ../src/interface.c:3369 -#, fuzzy +#: ../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." @@ -1887,11 +1890,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:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Merkitse käännösvirheet editorissa" -#: ../src/interface.c:3374 +#: ../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" @@ -1899,23 +1902,23 @@ "Määrittää, merkitäänkö (aaltoviivalla) rivit, joista kääntäjä antaa " "varoituksen tai virheilmoituksen" -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Rivinvaihto siistii rivin lopun" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Rivinvaihto karsii tyhjän tilan edellisen rivin lopusta" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Rivityssarake:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Kommentoinnin ilmaisin:" -#: ../src/interface.c:3406 +#: ../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." @@ -1923,95 +1926,95 @@ "Merkkijono, joka ilmaisee, että rivi on merkitty kommentiksi tai sen " "kommentointi poistettiin." -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Ominaisuudet" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Ominaisuudet" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Automaattisisennys:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Perus" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Säilytä sisennys" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Seuraa sulkeita" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Tapa:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Leveys:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "Yhden sisennyksen leveys merkkeinä" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Lisää sisennys välilyönteinä" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Sisennys on yhtä kuin sarkain" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" "Lisää sisennys välilyönteinä, jos se on sarkainta kapeampi, muuten käytä " "molempia" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Kiinteä sarkainleveys:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 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:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Sarkain sisentää" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Sisennys" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Sisennys" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Katkelman täydennys" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2019,19 +2022,19 @@ "Täydennä määritetty lyhyt merkkiyhdistelmä pidemmäksi merkkijonoksi yhdellä " "näppäimenpainalluksella" -#: ../src/interface.c:3583 -msgid "XML tag auto completion" -msgstr "XML-tunnisteiden täydennys" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" +msgstr "XML-tunnisteiden automaattinen täydennys" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Usean rivin kommenttien jatkaminen" -#: ../src/interface.c:3591 +#: ../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" @@ -2039,11 +2042,11 @@ "Jatka automaattisesti usean rivin kommentteja, kun sellaisen sisään lisätään " "uusi rivi (kielissä kuten C, C++ ja Java)" -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "Symbolien täydennys" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "Symbolien automaattitäydennys" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2051,90 +2054,97 @@ "Täydennä automaattisesti avoimissa tiedostoissa olevat tunnetut symbolit " "(kuten funktiot, globaalit muuttujat, ...)" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "Täydennä automaattisesti kaikki sanat asiakirjassa" + +#: ../src/interface.c:3646 +msgid "Drop rest of word on completion" +msgstr "Poista loppuosa sanasta täydennettäessä" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Symboliehdotuksia enintään:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Ehdotusluettelon korkeus:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "Täydennettävä merkkimäärä:" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" +msgstr "Automaattisen täydennyksen vaatima merkkimäärä:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"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:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" msgstr "Täydennysehdotusluettelon korkeus riveinä" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +msgid "Maximum number of entries to display in the autocompletion list" msgstr "Täydennysehdotusluettelossa näytettävien kohteiden enimmäismäärä" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Täydennykset" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Kaarisulkeet ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Sulje kaarisulkeet heti avaavan heti sulkeen syöttämisen jälkeen" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Heittomerkit ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "Sulje heittomerkit heti avaavan heittomerkin syöttämisen jälkeen" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Aaltosulkeet { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Sulje aaltosulkeet heti avaavan sulkeen kirjoittamisen jälkeen" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Hakasulkeet [ ]" -#: ../src/interface.c:3698 -#, fuzzy +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "Sulje hakasulkeet heti avaavan sulkeen syöttämisen jälkeen" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Lainausmerkit \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "Sulje lainausmerkit heti avaavan lainausmerkin syöttämisen jälkeen" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Sulje lainausmerkit ja sulkeet" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Täydennykset" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Käänteiset syntaksivärit" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2142,44 +2152,43 @@ "Käytä valkoista tekstiä mustalla taustalla ja muuta värit käänteisiksi. " "Vaatii Geanyn uudelleenkäynnistyksen." -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Näytä sisennysvihjeet" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Näytä tyhjä tila" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Näytä välilyönnit pisteinä ja sarkaimet nuolina" -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Näytä rivinvaihdot" -#: ../src/interface.c:3753 -#, fuzzy +#: ../src/interface.c:3805 msgid "Shows the line ending character" -msgstr "Näytä rivinvaihtomerkit" +msgstr "Näytä rivinvaihtomerkit rivien lopussa" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Näytä rivinumerot" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Näytä tai piilota rivinumeroreunus" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Näytä merkintäreunus" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2187,38 +2196,38 @@ "Näytä tai piilota rivinumeroiden oikealla puolella pieni reunus, jota " "käytetään rivien merkitsemiseen" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Pysäytä viimeiselle riville" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Näyttö" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Pitkän rivin ilmaisin:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Pitkän rivin ilmaisimen väri:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Määrittää liian pitkän rivin ilmaisimen värin" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Värin valitsin" -#: ../src/interface.c:3826 +#: ../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 " @@ -2228,11 +2237,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:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Rivi" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2240,11 +2249,11 @@ "Piirtää editoriin pystysuoran viivan syöttämääsi kohdistimen sijaintiin (ks. " "alla)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Tausta" -#: ../src/interface.c:3846 +#: ../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 " @@ -2254,57 +2263,57 @@ "asetetaan valintasi mukaan. (Suositeltavaa, jos käytät suhteutettua " "kirjasinta.)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Ei käytössä" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Pitkän rivin ilmaisin" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Näyttö" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Luo uusi asiakirja komentoriviltä" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Oletusarvoinen rivinvaihtomerkki:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Uudet tiedostot" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 msgid "Sets the default encoding for newly created files" msgstr "Asettaa oletusmerkistön uusille tiedostoille" -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Oletusmerkistö (uusi tiedosto):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Oletusmerkistö (tiedosto olemassa):" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 msgid "Sets the default encoding for opening existing files" msgstr "Asettaa oletusmerkistön avattaville tiedostoille" -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Kiinteä merkistö tiedostoja avattaessa" -#: ../src/interface.c:3978 +#: ../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 " @@ -2313,52 +2322,52 @@ "Määrittää, että tiedostojen merkistöä ei tunnisteta automaattisesti, vaan " "tiedostot avataan aina käyttäen määritettyä merkistöä (yleensä ei tarpeen)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Merkistöt" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Tiedoston lopussa aina tyhjä rivi" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Karsi tyhjä tila rivien lopusta" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Korvaa sarkaimet välilyönneillä" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Korvaa kaikki asiakirjan sarkaimet välilyönneillä" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Tiedostojen tallennus" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Viimeaikaisten tiedostojen määrä:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Levyn tarkistusviive:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2366,27 +2375,27 @@ "Asiakirjatiedostojen muutosten tarkistusväli sekunteina. Nolla poistaa " "tarkkailun käytöstä." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Tiedostot" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Pääte:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Selain:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Make-työkalun polku ja valitsimet" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2394,23 +2403,23 @@ "Pääteohjelma kuten xterm, gnome-terminal tai konsole (täytyy hyväksyä " "valitsin \"-e\")" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Suosikkiselaimesi tiedostopolku (ja mahdolliset valitsimet)" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Työkalujen polut" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Kontekstitoiminto:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2420,67 +2429,67 @@ "Kontekstitoiminnon komento. Merkintä %s korvataan editorin valinnalla ennen " "komennon suorittamista." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Komennot" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Työkalut" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "kehittäjän sähköpostiosoite" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Kehittäjän nimikirjaimet" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Oletusversio:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Versionumero, joka uudella tiedostolla on luotaessa" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Yrityksen nimi" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Kehittäjä:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Yritys:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Sähköposti:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Nimikirjaimet:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Kehittäjän nimi" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Vuosi:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Päiväys:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Päiväys ja aika" -#: ../src/interface.c:4382 +#: ../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." @@ -2488,7 +2497,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:4389 +#: ../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." @@ -2496,7 +2505,7 @@ "Syötä merkkijonon {year} korvaavan vuosiluvun esitysmuoto. Voit käyttää ANSI " "C -standardin strftime-funktion ymmärtämiä merkintöjä." -#: ../src/interface.c:4396 +#: ../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." @@ -2504,84 +2513,81 @@ "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:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Mallinetiedot" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Mallineet" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "_Vaihda" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Pikanäppäimet" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Pikanäppäimet" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Komento:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Tulostuskomennon polku (%f korvataan tiedostonimellä)" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Käytä ulkoista tulostuskomentoa" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Tulosta rivinumerot" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Lisää rivinumerot tulostetulle sivulle" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Tulosta sivunumerot" -#: ../src/interface.c:4518 ../src/printing.c:352 -#, fuzzy +#: ../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 "Lisää sivunumerot jokaisen sivun alareunaan. Vie 2 rivin verran tilaa" +msgstr "Lisää sivunumerot jokaisen sivun alareunaan. Vie kaksi riviä tilaa." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Tulosta ylätunniste" -#: ../src/interface.c:4523 ../src/printing.c:357 -#, fuzzy +#: ../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 "" "Lisää jokaiselle sivulle ylätunnisteen, joka sisältää sivunumeron, " -"tiedostonimen sekä päiväys (ks. alla). Vie kolme riviä tilaa." +"tiedostonimen sekä päiväyksen (ks. alla). Vie kolme riviä tilaa." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Tulosta tiedostonimen perusosa" -#: ../src/interface.c:4543 -#, fuzzy +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" msgstr "Tulosta vain tulostettavan tiedoston nimi ilman polkua" -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Päiväyksen muoto:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2591,535 +2597,551 @@ "esitysmuoto. Voit käyttää ANSI C -standardin strftime-funktion ymmärtämiä " "merkintöjä." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Käytä GTK:n tulostusta" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Tulostus" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Projektin ominaisuudet" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Tiedosto" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Uusi" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Avaa" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Avaa valittu tiedosto" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Tallenna" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Tallenna nimellä" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Tallenna kaikki" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Tulosta" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Sulje" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Sulje kaikki" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Lataa tiedosto uudelleen" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Projekti" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Projektin ominaisuudet" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Peru" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Tee uudelleen" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Kahdenna rivi tai valinta" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Poista rivi(t)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +msgid "Delete to line end" +msgstr "Poista rivin loppuun" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "Vaihda rivin paikkaa" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Vieritä nykyiselle riville" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Vieritä ylös yhden rivin verran" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Vieritä alas yhden rivin verran" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Täydennä katkelma" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Siirrä kohdistin katkelmaan" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Estä katkelman täydennys" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Kontekstitoiminto" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Täydennä sana" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Näytä kutsuvihje" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Näytä makroluettelo" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Leikepöytä" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Leikkaa" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Kopioi" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Liitä" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Kopioi rivi(t)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Leikkaa rivi(t)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Valitse" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Valitse Kaikki" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Valitse sana" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Valitse rivi(t)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Valitse kappale" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Muotoile" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Vaihda kirjainkoko" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Lisää/Poista kommentointi" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Kommentoi rivi(t)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Poista kommentointi" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Kasvata sisennystä" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Vähennä sisennystä" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Kasvata sisennystä merkin verran" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Vähennä sisennystä merkin verran" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Älykäs rivien sisennys" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Suorita mukautettu komento 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Suorita mukautettu komento 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Suorita mukautettu komento 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Lähetä valinta päätteeseen" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "Rivitä uudelleen valinta tai nykyinen kappale" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Lisää" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Lisää päiväys" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Lisää vaihtoehtoinen tyhjä tila" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Asetukset" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Etsi" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Etsi" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Etsi seuraava" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Etsi edellinen" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Etsi seuraava valinta" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Etsi edellinen valinta" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Korvaa" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Etsi tiedostoista" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Seuraava viesti" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Edellinen viesti" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Etsi avoimista" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Etsi asiakirjasta" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "Merkitse kaikki" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Siirry" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Edelliseen sijaintiin" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Seuraavaan sijaintiin" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Sulkeen pari" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Lisää/poista merkintä" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Seuraava merkintä" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Edellinen merkintä" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Tunnisteen kuvaus" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Tunnisteen määritys" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Rivin alkuun" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Rivin loppuun" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "Näytöllä rivin loppuun" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Edellinen sana" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Seuraava sana" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Näytä" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Näytä/Piilota lisäkomponentit" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Kokoruututila" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Näytä/Piilota viesti-ikkuna" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Näytä/Piilota sivupalkki" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Suurenna" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Pienennä" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Kohdistus" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Editoriin" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Muistilappuun" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Päätteeseen" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Hakupalkkiin" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Sivupalkkiin" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Kääntäjään" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Välilehdet" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Vasemmanpuoleinen asiakirja" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Oikeanpuoleinen asiakirja" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Viimeksi käytetty asiakirja" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Siirrä asiakirja vasemmalle" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Siirrä asiakirja oikealle" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Siirrä asiakirja ensimmäiseksi" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Siirrä asiakirja viimeiseksi" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Asiakirja" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Rivitys päälle/pois" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Rivien katkaisu päälle/pois" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Korvaa sarkaimet välilyönneillä" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Supista/laajenna" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Supista kaikki" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Laajenna kaikki" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Virkistä symbolilista" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Koosta" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Käännä" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Koosta kaikki" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Koosta valinnainen kohde" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Koosta olio" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Seuraava virhe" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Edellinen virhe" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Suorita" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Suorita (vaihtoehtoinen)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Koostajan valitsimet" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Näytä värivalitsin" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Ohje" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Pikanäppäimet" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Voit muokata seuraavia pikanäppäimiä:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Siirry asiakirjaan" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Yhden tai useamman istuntotiedoston lataus epäonnistui." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Vianetsintäviestit" @@ -3133,7 +3155,7 @@ #: ../src/main.c:125 msgid "Use an alternate configuration directory" -msgstr "Käytä vaihtoehtoista asetushakemistoa" +msgstr "Käytä vaihtoehtoista asetuskansiota" #: ../src/main.c:126 ../src/main.c:146 msgid "Be verbose" @@ -3176,7 +3198,7 @@ msgstr "Tulosta Geanyn asennuspolku" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "Älä lataa edellisen istunnon tiedostoja" #: ../src/main.c:143 @@ -3191,24 +3213,24 @@ msgid "Show version and exit" msgstr "Tulosta versiotiedot" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[TIEDOSTOT...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Siirretäänkö se heti?" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "Vanha asetuskansiosi täytyy siirtää ennen Geanyn käynnistystä" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3217,7 +3239,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3226,33 +3248,33 @@ "Asetuskansiosi siirto ei onnistunut kohteesta \"%s\" kohteeseen \"%s\" (%s). " "Ole hyvä ja siirrä kansio käsin uuteen sijaintiin." -#: ../src/main.c:730 +#: ../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 "" -"Asetushakemiston luominen epäonnistui (%s).\n" -"Geany ei välttämättä toimi oikein ilman asetushakemistoa.\n" +"Asetuskansion luominen epäonnistui (%s).\n" +"Geany ei välttämättä toimi oikein ilman asetuskansiota.\n" "Käynnistetäänkö Geany tästä huolimatta?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Tämä on Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." -msgstr "Asetushakemiston luominen epäonnistui (%s)." +msgstr "Asetuskansion luominen epäonnistui (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Asetustiedostot ladattiin uudelleen." @@ -3268,7 +3290,7 @@ msgid "_Hide Message Window" msgstr "_Piilota viesti-ikkuna" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3277,11 +3299,11 @@ "Liitännäinen \"%s\" täytyy kääntää uudelleen, jotta se toimisi tämän Geany-" "version kanssa" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Liit_ännäisten hallinta" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3292,23 +3314,23 @@ "Kuvaus: %s\n" "Tekijä(t): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Aktiivinen" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Liitännäinen" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Ei liitännäisiä" -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Liitännäiset" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3316,56 +3338,64 @@ "Alla on luettelo käytettävissä olevista liitännäisistä. Valitse Geanyn " "käynnistyessä ladattavat liitännäiset." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Liitännäisen tiedot:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Toiminto" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Pikanäppäin" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Kaappaa näppäin" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "_Laajenna kaikki" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "S_upista kaikki" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Toiminto" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Pikanäppäin" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "K_orvaa" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Korvataanko pikanäppäin?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Näppäinyhdistelmä \"%s\" on jo liitetty toimintoon \"%s\"" #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 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:1458 +#: ../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." @@ -3375,7 +3405,7 @@ "Geanyn uudelleen tai valitset Työkalut->Lataa asetukset uudelleen." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3386,7 +3416,7 @@ "kaksoisnapsauta näppäinyhdistelmää muokataksesi pikanäppäimen merkkijonoa." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3394,17 +3424,8 @@ "Huomaa: GTK:n oma tulostus on käytettävissä ainoastaan, jos sekä Geanyn " "käännöksen aikainen että käytössä oleva GTK:n versio on vähintään 2.10." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"Huomaa: Voit mukauttaa työkalupalkin sisältöä muokkaamalla tiedostoa " -"\"ui_toolbar.xml\". Lisätietoja käyttöohjeessa." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3412,45 +3433,52 @@ "Varoitus: Projektikohtaiset asetukset menevät näiden asetusten edelle. " "Ks. Projekti->Ominaisuudet." -#: ../src/printing.c:270 +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "Editorin kirjasin ei ole tasalevyinen!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "Tekstin sanavälit menevät väärin." + +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Sivu %d/%d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Asiakirjan asetukset" -#: ../src/printing.c:375 +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" msgstr "Tulosta vain tulostettavan tiedoston nimi ilman polkua" -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Sivu %d/%d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Tiedoston \"%s\" tulostus peruttiin." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Tiedosto %s tulostettu." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Tiedoston \"%s\" tulostus epäonnistui (%s)." -#: ../src/printing.c:832 -#, fuzzy +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." msgstr "Aseta ensin tulostuskomento asetusikkunassa" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3461,7 +3489,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Tiedoston \"%s\" tulostus epäonnistui (paluuarvo: %s)." @@ -3480,19 +3508,19 @@ msgid "C_reate" msgstr "_Luo" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nimi:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Tiedostonimi:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Pääkansio:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3501,41 +3529,41 @@ "Polku projektin kaikkien tiedostojen pääkansioon. Kansio voi olla uusi tai " "olemassaoleva. Voit merkitä polun suhteessa projektitiedostoon." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Valitse projektin pääkansio" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Projektitiedostoa \"%s\" ei voitu ladata." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Avaa projekti" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Projektitiedostot" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Projekti \"%s\" suljettu." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Kuvaus:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Koosta pääkansiossa" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Suorituskomento:" -#: ../src/project.c:457 +#: ../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." @@ -3543,81 +3571,81 @@ "Projektin pääkansiossa suoritettava komentorivi. Komennolle voi määrittää " "myös valitsimia. Jätä tyhjäksi, jos haluat käyttää oletuskomentoa." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Tiedostokaavat:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Tallennetaanko tiedosto ennen jatkamista?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Projekti \"%s\" on jo auki." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Projektin nimi on liian lyhyt." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Projektitiedoston nimi ei kelpaa." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Luodaanko projektin pääkansio?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Polkua \"%s\" ei löydy." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektin pääkansion luominen epäonnistui (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektitiedoston tallennus epäonnistui (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Projekti \"%s\" luotu." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Projekti \"%s\" tallennettu." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Valitse projektitiedoston nimi" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Valitse projektin suorituskomento" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Projekti \"%s\" avattu." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Käytä sää_nnöllisiä lausekkeita" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3625,15 +3653,15 @@ "Käytä POSIX-standardin mukaisia säännöllisiä lausekkeita (regular " "expressions). Lisätietoja käyttöohjeessa." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Etsi takape_rin" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Käytä o_hjausmerkkejä" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3641,395 +3669,402 @@ "Korvaa \\\\, \\t, \\n, \\r ja \\uXXXX (Unicode-merkit) vastaavilla " "ohjausmerkeillä" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Huo_mioi kirjainkoko" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Etsi k_okonaisia sanoja" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Etsi sanan al_usta" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "E_dellinen" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Seuraava" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" -msgstr "_Etsittävä:" +msgstr "E_tsittävä:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "Etsi k_aikki" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Merkitse" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Merkitse kaikki asiakirjasta löydetyt esiintymät." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "_Istunnosta" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "Asiakirjas_ta" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Sulj_e ikkuna" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Jos tätä ei ole valittu, ikkuna pysyy avoinna" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Etsi ja kor_vaa" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "K_orvaava:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Korvaa _kaikki" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "Va_linnasta" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Korvaa kaikki valitusta tekstistä löydetyt esiintymät" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "Ka_nsio:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "Merkist_ö:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Merkki_jonot" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Grepin säännölliset lausekkeet" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "Lisätietoja grepin käyttöohjeessa (man grep)" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "Laajat s_äännölliset lausekkeet" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Etsi m_yös alikansioista" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "Kää_nteiset tulokset" -#: ../src/search.c:782 -#, fuzzy +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Valitse rivit, jotka eivät vastaa hakua" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Lisä_valitsimet:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Grep-komennon lisävalitsimet" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "%d osuma haulla \"%s\"." msgstr[1] "%d osumaa haulla \"%s\"." -#: ../src/search.c:1184 +#: ../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:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "\"Etsi tiedostoista\" ei onnistu määritetyssä kansiossa." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Ei haettavaa tekstiä." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Etsitään..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (kansiossa: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Kansion avaaminen epäonnistui (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "Haku epäonnistui (Ks. Ohje->Vianetsintäviestit)" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Haku ei tuottanut tulosta." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Luku" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Kappale" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Kpl1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Kpl2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Kpl3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Liite" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Muu" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Moduuli" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Tyypit" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Tyyppien muodostimet" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Funktiot" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Osat" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Avaimet" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Muuttujat" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Komento" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Ympäristö" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Aliosa" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Alialiosa" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Nimike" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Tietueet" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Paketti" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Minun" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Paikallinen" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Meidän" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Rajapinnat" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Luokat" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Vakiot" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Ankkurit" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "H1-otsikot" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "H2-otsikot" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "H3-otsikot" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "ID-valitsimet" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Tyyppivalitsimet" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Moduulit" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Ainokaiset" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Metodit" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Nimiavaruudet" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Proseduurit" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "Viennit" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Jäsenet" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Nimikkeet" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Alirutiinit" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blokit" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Makrot" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Määrittelyt" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Kohteet" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Nimiavaruudet" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Tietueet" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Tyyppimäärittelyt / Luetellut tyypit" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Tuntematon tiedostopääte \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4038,7 +4073,7 @@ "Käyttö: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4049,170 +4084,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Lataa tunnisteet" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Geanyn tunnisteet (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Ladattu tunnisteet tyypille %s \"%s\"." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Tunnistetiedoston \"%s\" lataaminen epäonnistui." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "\"%s\" esittelyä ei löydy." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" määritystä ei löydy." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "_Laajenna kaikki" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "S_upista kaikki" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Järjestä _nimen mukaan" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Järjestä _esiintymisen mukaan" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Tallenna tiedosto" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Tallenna _kaikki" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Tallenna kaikki avoimet tiedostot" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Lataa nykyinen tiedosto uudelleen" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Sulje tiedosto" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Sulje avoimet tiedostot" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Leikkaa valinta" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Kopioi valinta" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Liitä leikepöydän sisältö" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Poista valinta" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Peru viimeisin muutos" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Tee uudelleen viimeisin muutos" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Käännä tiedosto" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Suorita tai näytä tiedosto" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Suurenna tekstiä" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Pienennä tekstiä" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Vähennä sisennystä" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Kasvata sisennystä" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Etsi kentän teksti nykyisestä tiedostosta" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Siirry kenttään syötetylle riville" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Näytä asetusikkuna" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Sulje Geany" -#: ../src/toolbar.c:75 -#, fuzzy +#: ../src/toolbar.c:79 msgid "Print document" -msgstr "XML-dokumentti" +msgstr "Tulosta tiedosto" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" -"Tähän tiedostoon tekemäsi muutokset astuvat voimaan kun Geany käynnistetään " -"uudelleen." +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "Korvaa tekstiä nykyisestä asiakirjasta" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Luo uusi tiedosto" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Avaa tiedosto" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Siirry" +#: ../src/toolbar.c:533 +msgid "Separator" +msgstr "Erotin" + +#: ../src/toolbar.c:534 +msgid "--- Separator ---" +msgstr "--- Erotin ---" + +#: ../src/toolbar.c:897 +msgid "" +"Select items to be displayed on the toolbar. Items can be reordered by drag " +"and drop." +msgstr "" +"Valitse työkalupalkissa näytettävät kohteet. Niitä voi järjestellä " +"raahaamalla ja pudottamalla." + +#: ../src/toolbar.c:913 +msgid "Available Items" +msgstr "Saatavilla olevat kohteet" + +#: ../src/toolbar.c:934 +msgid "Displayed Items" +msgstr "Näytetyt kohteet" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4280,123 +4323,143 @@ msgid "Characters:" msgstr "Merkkejä:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Tunnisteita ei löytynyt" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Näytä _symbolilista" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Näytä _asiakirjalista" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "_Piilota sivupalkki" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "Näytä _Polut" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "SAR" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "VL" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "S/V" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "tila: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "merkistö: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "tyyppi: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "näkyvyys: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Kirjasin päivitetty (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C:n vakiokirjasto" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C:n vakiokirjasto)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++:n vakiokirjasto" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Päivämäärän muotoilu" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Valitse kansio" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Valitse tiedosto" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Aset_ustiedostot" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Tallenna _kaikki" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Sulje kaikki" +#: ../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 "Pääte" @@ -4561,161 +4624,145 @@ "Suorita ohjelmat sisäisessä virtuaalipäätteessä erillisen pääteikkunan " "sijaan. Huomaa, että näin suoritettuja ohjelmia ei voi pysäyttää." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geanyn projektitiedostot" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Käynnistystiedostot" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Virhe" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Kysymys" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Varoitus" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Tietoa" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Luokan rakentaja" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Luo lähdetiedostot uusille luokkatyypeille." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Luo luokka" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Luokka" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Luokan nimi:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Otsaketiedosto:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Lähdetiedosto:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Perintä" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Kantaluokka:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Kantaotsake:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Globaali" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Kanta-GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Valinnat" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Luo muodostin" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Luo hajotin" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+-muodostintyyppi" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "_Luo luokka" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "_C++-luokka" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "_GTK+-luokka" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML-erityismerkit" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Lisää HTML-erityismerkkejä kuten \"&\"." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Geanyn kehittäjät" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML-erikoismerkit" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 -merkit" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Kreikkalaiset merkit" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Matemaattiset merkit" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Tekniset merkit" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Nuolimerkit" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Välimerkit" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Muut merkit" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Erikoismerkit" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Lisää" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4723,161 +4770,155 @@ "Valitse luettelosta erikoismerkki ja lisää se kohdistimen sijaintiin " "kaksoisnapsauttamalla tai Lisää-painikkeen avulla." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Merkki" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (nimi)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Lisää _HTML-erikoismerkkejä" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 -#, fuzzy +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" -msgstr "Korvaa" +msgstr "HTML-korvaus" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" -msgstr "" +msgstr "_HTML-vaihto" -#: ../plugins/htmlchars.c:715 -#, fuzzy +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" -msgstr "Uusien välilehtien sijainti:" +msgstr "Erikoismerkkien massamuutos" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Lisää HTML:n erikoismerkkejä" -#: ../plugins/htmlchars.c:733 -#, fuzzy +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" -msgstr "Erikoismerkit" +msgstr "Korvaa erikoismerkit" -#: ../plugins/htmlchars.c:736 -#, fuzzy +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" -msgstr "Lisää/Poista kommentointi" +msgstr "Vaihda liitännäisen tilaa" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Vie" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Vie nykyisen tiedoston eri tiedostomuotoihin." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Vie tiedosto" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Nykyinen tekstin koko" -#: ../plugins/export.c:193 -#, fuzzy +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" -msgstr "" -"Käyttää tekstin nykyistä suurennostasoa tekstin ja asiakirjan piirtämiseen." +msgstr "Piirrä käyttäen nykyistä tekstin kokoa ja suurennostasoa" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Tiedosto viety nimellä \"%s\"" -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Tiedoston \"%s\" kirjoitus epäonnistui (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Vie" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "_HTML-muotoon" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "_LaTeX-muotoon" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Tiedostoselain" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Lisää tiedostoselainvälilehden sivupalkkiin." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Liikaa valittuja kohteita!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Ulkoisen komennon \"%s\" suoritus epäonnistui (%s)" -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Avaa _ulkoisesti" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Etsi tiedostoista" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Näytä _piilotiedostot" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Ylös" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Virkistä" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Koti" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Avaa asiakirjan polku" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Tyhjennä suodatin" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Suodatin:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Kohdista tiedostoluetteloon" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Kohdista polkukenttään" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "Liitännäiskansion luominen epäonnistui." @@ -4916,39 +4957,39 @@ "obj, *.so, *.dll, *.a, *.lib)" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" -msgstr "Siirry projektin pääkansioon" +msgid "Use the project's base directory" +msgstr "Käytä projektin pääkansiota" #: ../plugins/filebrowser.c:1132 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Avaa avoinna olevan projektin pääkansio" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Tallennustoiminnot" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "Erilaisia tiedostojen tallentamiseen liittyviä toimintoja" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Varmuuskopio: Kansion luominen epäonnistui (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Varmuuskopio: Tiedoston lukeminen epäonnistui (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Varmuuskopio: Tiedoston tallennus epäonnistui (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4956,114 +4997,130 @@ msgstr[1] "Automaattitallennus: %d tiedostoa tallennettu." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Valitse kansio" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Varmistuskansiota ei ole tai siihen ei voi kirjoittaa." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Automaattitallennus" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Käytä" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "Tallennus_väli:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "sekuntia" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "_Tulosta tilaviesti aina automaattitallennuksen jälkeen." -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Tallenna vain _nykyinen tiedosto" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Tallenna k_aikki avoimet tiedostot" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Välitön tallennus" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "_Uusien tiedostojen oletusmerkistö:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Varmuuskopio" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "Kansio, johon va_rmuuskopiot tallennetaan" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" "Varmuuskopion _aikaleiman muoto (strftime-funktion ymmärtämässä muodossa):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Ka_nsiotasojen määrä varmistuskohteessa:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Jaettu näkymä" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Jakaa editorin kahteen näkymään" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Näytä nykyinen asiakirja" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Yhdistä" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Jaa" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Vaakasuunnassa" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Pystysuunnassa" -#: ../plugins/splitwindow.c:422 -#, fuzzy +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" -msgstr "_Vaakasuunnassa" +msgstr "Jaa vaakasuunnassa" -#: ../plugins/splitwindow.c:424 -#, fuzzy +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" -msgstr "_Pystysuunnassa" +msgstr "Jaa pystysuunnassa" -#: ../plugins/splitwindow.c:426 -#, fuzzy +#: ../plugins/splitwindow.c:431 msgid "Unsplit" -msgstr "_Yhdistä" +msgstr "Yhdistä" -#~ msgid "Failed to view %s (make sure it is already compiled)" -#~ msgstr "" -#~ "Tiedoston %s näyttäminen epäonnistui. Varmista että se on käännetty." +#~ msgid "Diff file" +#~ msgstr "Diff-tiedosto" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText-tiedosto" + +#~ msgid "Select _All" +#~ msgstr "_Valitse kaikki" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Symbolien täydennys" #~ 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." +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "Huomaa: Voit mukauttaa työkalupalkin sisältöä muokkaamalla tiedostoa " +#~ "\"ui_toolbar.xml\". Lisätietoja käyttöohjeessa." -#~ msgid "Jump to the entered line number." -#~ msgstr "Siirry kenttään syötetylle riville" +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "Tähän tiedostoon tekemäsi muutokset astuvat voimaan kun Geany " +#~ "käynnistetään uudelleen." diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/fr.po /tmp/ssBwSf4GIv/geany-0.18/po/fr.po --- geany-0.17/po/fr.po 2009-04-25 10:42:55.000000000 +0100 +++ geany-0.18/po/fr.po 2009-08-16 17:18:28.000000000 +0100 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the geany package. # Jean-Philippe Moal , 2006 - 2009. # Roland Baudin , 2008 -# +# Lionel Fuentes , 2009 msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" -"PO-Revision-Date: 2009-04-07 00:11+0100\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"PO-Revision-Date: 2009-08-11 00:46+0100\n" "Last-Translator: Jean-Philippe Moal \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -29,53 +29,53 @@ msgid "Integrated Development Environment" msgstr "Environnement de Développement Intégré" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "À propos de Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Un EDI rapide et léger" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Infos" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Développeurs" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "mainteneur" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "développeur" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "mainteneur des traductions" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Traducteurs" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Traducteurs précédents" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Contributeurs" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" @@ -83,15 +83,15 @@ "Quelques uns des principaux contributeurs (pour une liste plus détaillé, " "voir le fichier %s) :" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Crédits" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licence" -#: ../src/about.c:389 +#: ../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." @@ -99,7 +99,7 @@ "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:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -108,134 +108,134 @@ "Impossible de trouver le terminal \"%s\" (vérifiez le chemin vers l'outil " "Terminal dans les préférences)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Processus échoué (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (dans le dossier : %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Impossible de changer le dossier de travail pour \"%s\"" -#: ../src/build.c:731 +#: ../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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Compilation échouée." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Compilation terminée avec succès." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Compiler" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make _Object" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Erreur suiva_nte" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "_Erreur précédente" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../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:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_Voir le fichier DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "Vo_ir le fichier PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "Définir les option_s" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Définir les options" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Création de DVI :" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Création de PDF :" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Prévisualisation de DVI :" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Prévisualisation de PDF :" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -244,70 +244,70 @@ "%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" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Définir les includes et les options" -#: ../src/build.c:1506 +#: ../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." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "Commandes pour %s" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Compiler :" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Construire :" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Exécuter :" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Construit le fichier courant" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make Custom Target" -#: ../src/build.c:1927 +#: ../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:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Compile le fichier courant avec make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Impossible d'exécuter le programme de visualisation" -#: ../src/build.c:2082 +#: ../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:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Plus d'erreurs de construction." @@ -315,8 +315,8 @@ msgid "Do you really want to quit?" msgstr "Voulez-vous réellement quitter ?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Recharger" @@ -329,53 +329,53 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Êtes-vous sur de vouloir recharger '%s' ?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Aller à la ligne" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 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:1341 ../src/callbacks.c:1366 +#: ../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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "jj.mm.aaaa" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.jj.aaaa" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "aaaa/mm/jj" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "jj.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.jj.aaaa hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/jj hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Utiliser le format de date personnalisé" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Format de date personnalisé" -#: ../src/callbacks.c:1495 +#: ../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." @@ -384,24 +384,24 @@ "tous les spécificateurs de conversion qui peuvent être utilisés avec la " "fonction C ANSI strftime." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Plus d'éléments de messages." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Ouvrir un fichier" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Affichage" -#: ../src/dialogs.c:150 +#: ../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." @@ -409,29 +409,28 @@ "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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Détecter depuis l'extension du fichier" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Détecter depuis le fichier" -#: ../src/dialogs.c:259 -#, fuzzy +#: ../src/dialogs.c:258 msgid "_More Options" -msgstr "Options" +msgstr "_Plus d'options" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Afficher les fichiers cac_hés" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Définir l'encodage :" -#: ../src/dialogs.c:287 +#: ../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 " @@ -446,11 +445,11 @@ "avec l'encodage choisi." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Définir le type de fichier :" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -462,23 +461,31 @@ "Notez que si vous choisissez plusieurs fichier, ils seront tous ouverts avec " "le type de fichier choisi." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Écraser ?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Le nom de fichier existe déjà !" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Enregistrer le fichier" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "R_enommer" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Enregistre le fichier et le renomme" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Ouvrir le fichier dans un nouvel onglet" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -486,24 +493,41 @@ "Conserve le document en cours non enregistré et ouvre le nouveau fichier " "enregistré dans un nouvel onglet." -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Erreur" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Question" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Avertissement" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Information" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "Ne pas enre_gistrer" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Le fichier '%s' n'est pas enregistré." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Voulez-vous l'enregistrer avant la fermeture ?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Choisir la police" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -511,106 +535,106 @@ "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:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "inconnu" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Propriétés" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Type :" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Taille :" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Emplacement :" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Lecture seule :" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(seulement pour Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Encodage :" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(avec BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(sans BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Modifié :" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Changé :" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Accédé :" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Permissions :" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Lecture :" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Écriture :" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Propriétaire :" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Groupe :" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Autres :" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Fichier %s fermé." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Nouveau fichier \"%s\" ouvert." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Impossible d'ouvrir le fichier %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -625,12 +649,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Le fichier \"%s\" n'est pas valide %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -639,48 +663,51 @@ "Le fichier \"%s\" ne ressemble pas à un fichier texte ou son encodage n'est " "pas supporté." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Espaces" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabulations" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Définir le mode d'indentation %s pour %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Nom de fichier invalide" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Fichier %s rechargé." -#: ../src/document.c:1354 +#. 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 "Fichier %s ouvert (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", lecture seule" -#: ../src/document.c:1561 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Erreur lors du renommage du fichier." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -689,7 +716,7 @@ "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:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -698,52 +725,52 @@ "Message d'erreur : %s\n" "L'erreur s'est produite à \"%s\" (ligne : %d, colonne : %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Message d'erreur : %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Erreur lors de l'enregistrement du fichier." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Erreur lors de l'enregistrement du fichier (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Fichier %s enregistré." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" n'a pu être trouvé." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Recommencer la recherche ?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Aucune correspondance trouvée pour \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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 : Remplacement de %d occurrence de \"%s\" par \"%s\"." msgstr[1] "%s : Remplacement de %d occurrences de \"%s\" par \"%s\"." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Voulez-vous le recharger ?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -752,32 +779,20 @@ "Le fichier '%s' sur le disque est plus récent que\n" "le tampon actuel." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Essayer de sauvegarder à nouveau le fichier ?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Le fichier \"%s\" n'a pu être trouvé!" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Largeur des tabulations" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Entrer le nombre d'espaces à remplacer par une tabulation." @@ -878,133 +893,122 @@ msgstr "Chinois traditionnel" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japonais" -#: ../src/encodings.c:141 ../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" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Sans encodage" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "Européen de l'_ouest" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "Européen de l'_est" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "_Asiatique de l'est" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "Asiatique du _SE & SO" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Moyen-Oriental" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Aucun" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Fichier source %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "fichier %s" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Aucun" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Script Shell" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Document XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Feuille de style en cascade" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "Dump SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Fichier Diff" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Fichier de Config" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Fichier de traduction Gettext" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "fichier de script %sl" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Fichier reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Langages de _Programmation" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Langages de _Script" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Langages de _Balisage" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Langages D_ivers" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Tout fichier source" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Tous les fichiers" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, 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:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "sans titre" @@ -1018,8 +1022,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "invisible" @@ -1027,7 +1031,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Ou_vrir le fichier sélectionné" @@ -1047,11 +1051,11 @@ msgid "Page Set_up" msgstr "_Mise en page" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Fermer les _autres fichiers" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "_Tout fermer" @@ -1059,83 +1063,79 @@ msgid "_Edit" msgstr "Édit_er" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Sélectionner _tout" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "M_odifier la casse de la séléction" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Commenter la(les) ligne(s)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Décomme_nter la(les) ligne(s)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Commen_ter/Décommenter la ligne" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Augmenter l'_indentation" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "_Diminuer l'indentation" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "Envoyer la _sélection vers le terminal" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "Envoyer la _sélection vers" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Insérer des co_mmentaires" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Insérer une entrée de _changelog" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Insérer un en-tête de fic_hier" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Insérer une description de _fonction" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Insérer un commentaire _multilignes" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Insérer une note _GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Insérer une note _BSD" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Insérer la dat_e" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "_Insérer \"include <...>\"" @@ -1159,7 +1159,7 @@ msgid "Find in F_iles" msgstr "Rechercher dans les f_ichiers" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "R_emplacer" @@ -1179,7 +1179,7 @@ msgid "Pr_evious Message" msgstr "Message _précédent" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Aller à la li_gne" @@ -1207,7 +1207,7 @@ msgid "Show Side_bar" msgstr "Afficher la _barre latérale" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Éditeur" @@ -1251,15 +1251,15 @@ msgid "In_dent Type" msgstr "T_ype d'indentation" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tabulations" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "E_spaces" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "Tabulations et _espaces" @@ -1379,7 +1379,7 @@ msgid "_Debug Messages" msgstr "_Messages de débogage" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Symboles" @@ -1403,71 +1403,75 @@ msgid "Scribble" msgstr "Notes" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Im_ages et texte" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "_Images seulement" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "_Texte seulement" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "_Grosses icônes" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Petite_s icônes" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "T_rès petites icônes" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "_Personnaliser la barre d'outils" + +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" msgstr "Cac_her la barre d'outils" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "_Rechercher dans tous les documents" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Rechercher dans le _document" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Aller à la définition du s_ymbole" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Aller à la déclaration du _symbole" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Action conte_xtuelle" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Préférences" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Charger les fichiers depuis la session précédente" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 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:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Charger le support du terminal virtuel" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1475,41 +1479,41 @@ "Charger ou non l'émulateur virtuel de terminal (VTE) au lancement, " "désactivez le si vous n'en avez pas besoin" -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Activer le support des plugins" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Démarrage" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Enregistrer la position et la géométrie de la fenêtre" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Confirmer la fermeture" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Affiche une boite de dialogue de confirmation lors de la fermeture" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Fermeture" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Dossier de démarrage :" -#: ../src/interface.c:2758 +#: ../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." @@ -1518,19 +1522,19 @@ "fichiers. Entrez un chemin absolu. Laissez vide pour utiliser le dossier de " "travail courant." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Fichiers de projet :" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 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:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Répertoire de plugin supplémentaire :" -#: ../src/interface.c:2808 +#: ../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 " @@ -1541,19 +1545,19 @@ "également utilisé pour la recherche. Laissez le champ vide pour désactiver " "cette fonction." -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Chemins" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Démarrage" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 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:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1561,11 +1565,11 @@ "Émettre ou non un bip si une erreur s'est produite ou lorsque le processus " "de compilation est fini" -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Se rendre à la liste des messages de statut aux nouveaux messages" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1573,11 +1577,11 @@ "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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Supprimer les messages de statut de la barre de statut" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1585,11 +1589,11 @@ "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:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Auto focus des fenêtres (le focus suit la souris)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1599,18 +1603,18 @@ "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:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Divers" # Adaptation de wrap -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "" "Toujours reprendre la recherche en boucle et cacher la fenêtre de recherche" # Adaptation de wrap -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1618,11 +1622,11 @@ "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:2893 +#: ../src/interface.c:2913 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:2896 +#: ../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" @@ -1631,20 +1635,20 @@ "dialogue de recherche, recherche dans les fichiers, ou remplacement si aucun " "texte n'est sélectionné" -#: ../src/interface.c:2898 +#: ../src/interface.c:2918 msgid "Use the current file's directory for Find in Files" msgstr "" "Utiliser le dossier du fichier courant pour la recherche dans les fichiers" -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Recherche" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Utiliser des fichiers de session basés sur les projets" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1652,11 +1656,11 @@ "Conserver ou non des fichiers de session d'un projet et les ouvrir lors de " "la réouverture du projet" -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Enregistrer le fichier projet dans le dossier de base du projet" -#: ../src/interface.c:2929 +#: ../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 " @@ -1668,75 +1672,75 @@ "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:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projets" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Divers" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Général" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Afficher la liste des symboles" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Affiche/Cache la liste des symboles" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Afficher la liste des documents" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Affiche/Cache la liste des documents" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Barre latérale" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Liste des symboles :" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Fenêtre de message :" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Éditeur :" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Définit la police utilisée pour la fenêtre de message" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Définit la police utilisée pour la liste des symboles" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Définit la police de l'éditeur" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Polices" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Afficher les onglets de l'éditeur" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Afficher les boutons de fermeture" -#: ../src/interface.c:3064 +#: ../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)" @@ -1744,113 +1748,117 @@ "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:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Placement des nouveaux onglets de fichier :" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Gauche" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Droite" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Un double-clic cache les fenêtres supplémentaires" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "" "Appelle la commande Affichage->Afficher/Cacher toutes les fenêtres " "supplémentaires" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Onglets de l'éditeur" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Haut" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Bas" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Barre latérale :" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Position des onglets" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Afficher la barre d'état" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Afficher la barre d'ou_tils" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "_Ajouter la barre d'outils au menu" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 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:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Barre d'outils" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Style des icônes :" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Taille des icônes :" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Apparence" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "Personnaliser la barre d'outils" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Barre d'outils" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Renvoi à la ligne" -#: ../src/interface.c:3349 +#: ../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 " @@ -1860,11 +1868,11 @@ "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:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Activer la touche home \"intelligente\"" -#: ../src/interface.c:3354 +#: ../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 " @@ -1878,11 +1886,11 @@ "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:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Désactiver le glisser-déposer" -#: ../src/interface.c:3359 +#: ../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" @@ -1891,19 +1899,19 @@ "é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:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Activer le pliage" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Active ou non le pliage du code" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 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:3369 +#: ../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." @@ -1912,12 +1920,12 @@ "sur la touche Shift lors d'un clic sur un symbole de repli le comportement " "inverse se produit." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 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:3374 +#: ../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" @@ -1925,95 +1933,94 @@ "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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Un passage à la ligne enlève les espaces de fin de ligne" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Colonne de retour à la ligne :" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Marqueur de commentaire :" -#: ../src/interface.c:3406 -#, fuzzy +#: ../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 insérée quand une ligne de code est commentée dans " -"un fichier source, utilisée pour marquer la mise en commentaire." +"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:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Fonctionnalités" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Fonctionnalités" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Mode d'indentation automatique :" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Basique" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Caractères courants" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Accolades correspondantes" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Type :" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Largeur :" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "La largeur, en caractères, d'une indentation simple" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Utiliser des espaces pour l'indentation" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Utiliser une tabulation par indentation" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Largeur des tabulations :" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2021,30 +2028,30 @@ "Détecter ou non le type d'indentation depuis le contenu d'un fichier lors de " "son ouverture" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Indentation par la touche Tab " -#: ../src/interface.c:3548 +#: ../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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Indentation" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Complétion des snippets" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2052,21 +2059,21 @@ "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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" msgstr "Complétion automatique des balises XML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Continuation automatique des commentaires multi-lignes" -#: ../src/interface.c:3591 +#: ../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" @@ -2075,11 +2082,11 @@ "tels que C, C++ et Java, quand une nouvelle ligne est entrée dans un tel " "commentaire" -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "Complétion automatique des symboles" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "Compléter automatiquement les symboles" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2087,101 +2094,109 @@ "Complétion automatique des symboles connus dans les fichiers ouverts (noms " "des fonctions, variables globales...)" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "Compléter automatiquement tous les mots du document" + +#: ../src/interface.c:3646 +msgid "Drop rest of word on completion" +msgstr "Supprimer le reste du mot lors de la complétion" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Nombre maximum de suggestions de nom de symbole :" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Hauteur de la liste de complétion :" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "Caractères à taper pour la complétion :" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" +msgstr "Caractères à taper pour la complétion automatique :" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"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:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" msgstr "Nombre de lignes à afficher dans la liste de complétion automatique" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +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" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Complétions" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Parenthèses ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" "Ferme automatiquement les parenthèses lors de l'écriture d'une parenthèse " "ouvrante" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Guillemets simples ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" "Ferme automatiquement les guillemets simples lors de l'écriture d'un " "guillemet ouvrant" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Accolades { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" "Ferme automatiquement les accolades lors de l'écriture d'une accolade " "ouvrante" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Crochets [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" "Ferme automatiquement les crochets lors de l'écriture d'un crochet ouvrant" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Guillemets doubles \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" "Ferme automatiquement les guillemets doubles lors de l'écriture d'un " "guillemet ouvrant" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Fermeture automatique des guillemets, accolades et crochets" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Complétions" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Inverser les couleurs de la coloration syntaxique" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2189,45 +2204,45 @@ "Utilise un texte blanc sur fond noir et inverse toutes les couleurs; cette " "option nécessite un redémarrage de Geany." -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Afficher les guides d'indentation" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Afficher les espaces" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 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:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Afficher les fins de lignes" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Affiche le caractère de fin de ligne" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Afficher les numéros de ligne" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Affiche ou masque la marge des numéros de ligne" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Afficher la marge des marqueurs" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2235,37 +2250,37 @@ "Affiche ou masque la petite marge à droite des numéros des lignes, qui est " "utilisée pour marquer les lignes" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Arrêter le défilement à la dernière ligne" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Affichage" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Marqueur des longues lignes :" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Couleur du marqueur des longues lignes :" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Définit la couleur du marqueur des longues lignes" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Sélecteur de couleur" -#: ../src/interface.c:3826 +#: ../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 " @@ -2276,11 +2291,11 @@ "ligne. Définissez une valeur supérieure à 0 pour spécifier la colonne où il " "devrait apparaître." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Ligne" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2288,11 +2303,11 @@ "Affiche une ligne verticale dans la fenêtre de l'éditeur à la position " "donnée (voir plus bas)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Fond" -#: ../src/interface.c:3846 +#: ../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 " @@ -2302,61 +2317,61 @@ "est changée pour la couleur définie plus bas. (Ceci est recommandé si vous " "utilisez des polices proportionnelles)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Désactivé" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Marqueur des longues lignes" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Affichage" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Ouvrir les nouveaux documents depuis la ligne de commande" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Caractères de fin de ligne par défaut :" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Nouveaux fichiers" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Encodage par défaut (nouveaux fichiers) :" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Encodage par défaut (fichiers existants) :" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../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:3978 +#: ../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 " @@ -2366,52 +2381,52 @@ "l'ouverture des fichiers et ouvre le fichier avec l'encodage spécifié (non " "requis habituellement)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Encodage" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Nouvelle ligne à la fin du fichier" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Enlever les espaces et tabulations de fin" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Remplacer les tabulations par des espaces" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Remplace toutes les tabulations du document par des espaces" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Enregistrement des fichiers" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Longueur de la liste des fichiers récents :" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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" -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Intervalle de vérification du disque :" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2420,27 +2435,27 @@ "disque, en secondes. Zéro signifie qu'aucune vérification péridoque n'est " "faite." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Fichiers" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make :" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal :" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Navigateur :" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Chemin et options pour l'outil make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2448,25 +2463,25 @@ "Un émulateur de terminal comme xterm, gnome-terminal ou konsole (doit " "accepter l'option -e )" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Chemin (et options supplémentaires si nécessaire) vers votre navigateur " "favori" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep :" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Chemins des outils" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Action contextuelle :" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2477,67 +2492,67 @@ "s. Il peut être placé n'importe où dans la commande donnée et sera remplacé " "avant exécution." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Commandes" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Outils" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "adresse e-mail du développeur" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Initiales du nom du développeur" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Version initiale :" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Numéro de version, qu'un nouveau fichier contient initialement" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Nom de l'entreprise" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Développeur :" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Entreprise :" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Adresse e-mail :" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Initiales :" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Le nom du développeur" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Année :" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Date :" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Date et heure :" -#: ../src/interface.c:4382 +#: ../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." @@ -2546,7 +2561,7 @@ "tous les spécificateurs de conversion qui peuvent être utilisés avec la " "fonction C ANSI strftime." -#: ../src/interface.c:4389 +#: ../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." @@ -2555,7 +2570,7 @@ "spécificateurs de conversion qui peuvent être utilisés avec la fonction C " "ANSI strftime." -#: ../src/interface.c:4396 +#: ../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." @@ -2564,65 +2579,65 @@ "spécificateurs de conversion qui peuvent être utilisés avec la fonction C " "ANSI strftime." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Données des modèles" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Modèles" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "C_hanger" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Raccourcis clavier" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Raccourcis" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Commande :" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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)" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Utiliser une commande externe pour imprimer" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Afficher les numéros de ligne" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Ajouter les numéros de lignes à la page imprimée" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Afficher les numéros de page" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Afficher les en-têtes des pages" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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." @@ -2630,19 +2645,19 @@ "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:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Utiliser le nom court du fichier à imprimer" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Format de date :" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2652,537 +2667,554 @@ "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:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Utiliser l'impression GTK native" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Imprimer" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Propriétés du projet" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Fichier" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nouveau" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Ouvrir" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Ouvrir le fichier sélectionné" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Enregistrer" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Enregistrer sous" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Tout enregistrer" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Imprimer" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Fermer" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Tout fermer" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Recharger le fichier" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Projet" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Propriétés du projet" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Annuler" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Refaire" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Dupliquer la ligne ou la sélection" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Effacer le(s) ligne(s) courante(s)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Défiler vers la ligne courante" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Faire défiler la vue d'une ligne vers le haut" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Faire défiler la vue d'une ligne vers le bas" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Compléter le snippet" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Déplacer le curseur dans le snippet" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Supprimer la complétion du snippet" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Action contextuelle" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Compléter le mot" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Afficher la bulle d'aide" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Afficher la liste des macros" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Presse-papiers" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Couper" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Copier" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Coller" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Copier le(s) ligne(s) courante(s)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Couper le(s) ligne(s) courante(s)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Sélection" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Tout sélectionner" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Selectionner le mot courant" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Sélectionner la(les) ligne(s) courante(s)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Sélectionner le paragraphe courant" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Modifier la casse de la sélection" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Commenter/Décommenter la ligne" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Commenter la(les) ligne(s)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Décommenter la(les) ligne(s)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Augmenter l'indentation" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Diminuer l'indentation" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Augmenter l'indentation d'une espace" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Diminuer l'indentation d'une espace" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Indentation intelligente des lignes " -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Envoyer vers la commande personnalisée 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Envoyer vers la commande personnalisée 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Envoyer vers la commande personnalisée 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Envoyer la sélection vers le terminal" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "Reformater les lignes/blocs" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Insérer" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Insérer la date" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Insérer un espacement alternatif" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Préférences" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Recherche" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Rechercher" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Rechercher le suivant" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Rechercher le précédent" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Rechercher la sélection" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Rechercher la sélection vers l'arrière" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Remplacer" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Rechercher dans les fichiers" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Message suivant" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Message précédent" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Utiliser la recherche" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Rechercher dans le document" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "Tout marquer" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Déplacements" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Naviguer en arrière vers une position" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Naviguer en avant vers une position" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Se rendre à l'accolade correspondante" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Ajouter/Supprimer un marqueur" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Se rendre au marqueur suivant" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Se rendre au marqueur précédent" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Aller à la définition du symbole" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Aller à la déclaration du symbole" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Aller au début de la ligne" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Aller à la fin de la ligne" -#: ../src/keybindings.c:389 +# fin de la ligne virtuelle si word wrapping +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "Aller à la fin de la ligne affichée" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Aller à la section de mot précédente" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Aller à la section de mot suivante" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Affichage" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Afficher/Cacher toutes les fenêtres supplémentaires" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Plein écran" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Afficher/Cacher la fenêtre de messages" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Afficher/Cacher la barre latérale" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Zoom avant" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Zoom arrière" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Focus" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Basculer vers l'éditeur" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Basculer vers les notes" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Basculer vers le VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Basculer vers la barre de recherche" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Basculer vers la barre latérale" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Basculer vers le compilateur" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Onglets" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Basculer vers le document de gauche" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Basculer vers le document de droite" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Basculer vers le dernier document utilisé" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Déplacer le document vers la gauche" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Déplacer le document vers la droite" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Déplacer le document en première position" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Déplacer le document en dernière position" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Document" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Basculer le renvoi à la ligne" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Basculer le retour à la ligne" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Remplacer les espaces par des tabulations" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Basculer le pliage courant" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Tout plier" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Tout déplier" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Recharger la liste des symboles" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Construire" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Compiler" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Make custom target" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Erreur suivante" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Erreur précédente" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Exécuter" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Exécuter (commande alternative)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Options de construction" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Afficher le sélecteur de couleurs" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Aide" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Raccourcis clavier" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Les raccourcis clavier suivants peuvent être configurés :" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Basculer vers le document" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Impossible de charger un ou plusieurs fichiers de session." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Messages de débogage" @@ -3211,11 +3243,10 @@ msgstr "Générer un fichier de tags global (voir la documentation)" #: ../src/main.c:129 -#, fuzzy 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 " -"fichier C/C++" +"fichiers C/C++" #: ../src/main.c:132 msgid "Don't open files in a running instance, force opening a new instance" @@ -3245,8 +3276,8 @@ msgstr "Imprime le préfixe de l'installation de Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "ne pas charger les fichiers des sessions précédentes" +msgid "Don't load the previous session's files" +msgstr "Ne pas charger les fichiers des sessions précédentes" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3260,25 +3291,25 @@ msgid "Show version and exit" msgstr "Afficher la version et quitter" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[FICHIERS...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Le déplacer maintenant ?" -#: ../src/main.c:633 +#: ../src/main.c:594 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." -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3289,7 +3320,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3299,7 +3330,7 @@ "\" (%s). Veuillez déplacer manuellement le dossier vers le nouvel " "emplacement." -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3311,22 +3342,22 @@ "configuration.\n" "Lancer Geany quand même ?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Voici Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, 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:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Fichiers de configuration rechargés." @@ -3342,7 +3373,7 @@ msgid "_Hide Message Window" msgstr "Cac_her la fenêtre de message" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3351,11 +3382,11 @@ "Le plugin \"%s\" n'est pas compatible au niveau binaire avec cette version " "de Geany - Veuillez le recompiler." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Gestionnaire de _plugin" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3366,23 +3397,23 @@ "Description : %s\n" "Auteur(s) : %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Actif" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Aucun plugin disponible." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3390,51 +3421,59 @@ "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:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Détails du plugin :" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Action" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Raccourci" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Entrer une touche" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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\"" -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "Tout dépli_er" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "Tout _replier" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Action" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Raccourci" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "Écras_er" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Écraser ce raccourci ?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "La combinaison '%s' est déjà utilisée pour \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3442,7 +3481,7 @@ "Spécifier ici les informations à utiliser dans les modèles. Voir la " "documentation pour plus de détails." -#: ../src/prefs.c:1458 +#: ../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." @@ -3453,7 +3492,7 @@ "paramètres en utilisant le menu Outils -> Recharger la configuration." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3465,7 +3504,7 @@ "caractères représentant le raccourci." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3474,18 +3513,8 @@ "compilé avec GTK 2.10 (ou supérieur) et Geany fonctionne avec GTK " "2.10 (ou supérieur)." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"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." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3493,47 +3522,56 @@ "Avertissement : ces préférences sont remplacées par celles du projet " "courant. Voir Projet->Propriétés." -#: ../src/printing.c:270 +#: ../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 !" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "Le texte sera espacé de façon incorrecte." + +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Page %d sur %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Mise en forme du document" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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" -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Page %d sur %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "L'impression du fichier %s a été annulée." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Le fichier %s a été imprimé." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "L'impression de %s a échoué (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 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." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3544,7 +3582,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "L'impression de \"%s\" a échoué (code de retour : %s)." @@ -3563,19 +3601,19 @@ msgid "C_reate" msgstr "C_réer" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nom :" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Nom de fichier :" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Dossier de base :" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3585,41 +3623,41 @@ "chemin, ou un dossier existant. Vous pouvez utiliser des chemins relatifs au " "nom du projet." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Choisir le dossier de base du projet" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Le fichier de projet \"%s\" n'a pu être chargé." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Ouvrir un projet" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Fichiers de projet" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Projet \"%s\" fermé." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Description :" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Lancer Make dans le dossier de base" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Commande à lancer :" -#: ../src/project.c:457 +#: ../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." @@ -3628,81 +3666,81 @@ "paramètres peuvent être ajoutés à la commande. Laissez vide pour utiliser la " "commande à exécuter par défaut." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Modèles de fichier :" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Voulez-vous le fermer avant de continuer ?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Le projet '%s' est déjà ouvert." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Le nom de projet spécifié est trop court." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Vous avez spécifié un nom de fichier de projet invalide." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Créer le dossier de base du projet ?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Le chemin \"%s\" est inexistant." -#: ../src/project.c:666 +#: ../src/project.c:670 #, 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:678 +#: ../src/project.c:682 #, 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:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Projet \"%s\" créé." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Projet \"%s\" enregistré." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Choix du nom du fichier du projet" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" -msgstr "Choix du nom du fichier du projet" +msgstr "Choix de la commande d'exécution du projet" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Projet \"%s\" ouvert." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "_Utiliser des expressions régulières" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3711,15 +3749,15 @@ "détaillées à propos de l'utilisation des expressions régulières, veuillez " "lire la documentation." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Rechercher vers _l'arrière" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Utiliser les séquences d'échapp_ement" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3727,402 +3765,410 @@ "Remplacer \\\\, \\t, \\n, \\r et \\uXXXX (caractères Unicode) par les " "caractères de contrôle correspondants" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Sensible à la c_asse" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Correspondre _seulement avec un mot entier" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Co_rrespondre avec le début du mot" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Précédent" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "Suiva_nt" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "Re_chercher :" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "Tout _trouver" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Marquer" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Marque toutes les correspondances dans le document courant" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "Dans la sessi_on" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "Dans le _document" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Fermer la _fenêtre" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Désactivez cette option pour laisser la fenêtre ouverte" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Remplacer et Rec_hercher" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Rem_placer par :" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Rempl_acer tout" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "Dans la sé_lection" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "" "Remplacer toutes les correspondances trouvées dans le texte actuellement " "sélectionné" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Dossier :" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "E_ncodage :" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Chaînes _fixes" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Expressions régulières de _Grep" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "Voir la page de manuel de grep pour plus d'informations" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "Expressions régulières ét_endues" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Recherche _récursive dans les sous-dossiers" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Inverser les résultats des recherches" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Inverse le sens des correspondances, pour sélectionner les lignes non " "correspondantes" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "_Options supplémentaires :" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Autres options à passer à grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "%d correspondances trouvées pour \"%s\"." msgstr[1] "%d correspondance trouvée pour \"%s\"." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Dossier invalide pour la recherche dans les fichiers." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Pas de texte à rechercher." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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." -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Recherche en cours..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (dans le dossier : %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Impossible d'ouvrir le dossier (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Pas de correspondances trouvées." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Chapitre" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Section" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Annexe" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Autre" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Module" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Types" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Constructeurs de type" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Fonctions" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Sections" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Clés" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Variables" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Commande" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Environment" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Sous-section" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Sous-sous-section" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Label" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Structures" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Package" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "My" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Our" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Classes" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Constantes" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Ancres" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Titres H1" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Titres H2" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Titres H3" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "Sélecteurs d'ID" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Sélecteurs de type" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Modules" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Méthodes" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Espaces de nommage" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Procédures" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "Imports" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Membres" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Labels" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Sous-routines" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blocs" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Définitions" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Cibles" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Espaces de nommage" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Extension de fichier inconnue pour \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4131,7 +4177,7 @@ "Utilisation : %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4142,173 +4188,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Charger des tags" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Chargement de %s fichiers de tags '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, 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:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Déclaration suivante de \"%s\" non trouvée." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Définition de \"%s\" non trouvée." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "Tout dépli_er" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "Tout _replier" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Trier par _nom" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Trier par ordre d'_apparition" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Enregistrer le fichier courant" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Tout enregistrer" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Enregistrer tous les fichiers ouverts" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Recharger le fichier courant depuis le disque" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Fermer le fichier courant" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Ferme tous les fichiers ouverts" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Couper la sélection courante" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Copier la sélection courante" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Colle le contenu du presse-papiers" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Supprimer la sélection courante" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Annuler la dernière modification" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Répéter la dernière modification" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Compiler le fichier courant" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Exécuter ou voir le fichier courant" -#: ../src/toolbar.c:66 +#: ../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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Zoomer en avant sur le texte" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Zoomer en arrière" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Diminuer l'indentation" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Augmenter l'indentation" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Rechercher le texte entré dans le fichier courant" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Se rendre à la ligne choisie" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Affiche la fenêtre des préférences" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Quitter Geany" -#: ../src/toolbar.c:75 -#, fuzzy +#: ../src/toolbar.c:79 msgid "Print document" -msgstr "Document XML" +msgstr "Imprimer le document" -#: ../src/toolbar.c:153 -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." +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "Remplacer le texte dans le document courant" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Créer un nouveau fichier" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Ouvrir un fichier existant" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Aller à" +#: ../src/toolbar.c:533 +msgid "Separator" +msgstr "Séparateur" + +#: ../src/toolbar.c:534 +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:913 +msgid "Available Items" +msgstr "Outils disponibles" + +#: ../src/toolbar.c:934 +msgid "Displayed Items" +msgstr "Outils affichés" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4377,124 +4431,144 @@ msgid "Characters:" msgstr "Caractères :" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Aucun symbole trouvé" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Afficher la liste des s_ymboles" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Afficher la liste des _documents" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Cacher la barre _latérale" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "Afficher les _chemins" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "ligne: %d\t col: %d\t sel: %d\t " # Lecture seule (barre d'état) #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "mode : %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "encodage : %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "type de fichier : %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "portée : %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Police mise à jour (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Bibliothèque C standard" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Bibliothèque C standard)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Bibliothèque C++ standard" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "STL C++" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "Définir le format de date per_sonnalisé" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Choisir un dossier" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Choisir un fichier" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Fichiers de c_onfiguration" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Tout enregistrer" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Tout fermer" +#: ../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 "Terminal" @@ -4664,161 +4738,145 @@ "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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Fichiers de projet Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Exécutables" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Erreur" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Question" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Avertissement" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Information" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Créateur de Classe" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Crée des fichiers sources pour une nouvelle classe." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Créer une classe" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Classe" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Nom de la classe :" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Fichier header :" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Fichier source :" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Héritage" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Classe de base :" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Header de base :" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "GType de base :" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Options" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Créer un constructeur" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Créer un destructeur" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Type de constructeur GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Créer une cla_sse" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "Classe _C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "Classe _GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caractères HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Insérer des entités HTML telles que '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "L'équipe de développement de Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Caractères HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Caractères ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Caractères grecs" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Caractères mathématiques" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Caractères techniques" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Caractères fléchés" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Caractères de ponctuation" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Caractères divers" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Caractères spéciaux" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Insérer" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4827,157 +4885,157 @@ "dessus ou utilisez le bouton pour l'insérer à la position actuelle du " "curseur." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Caractère" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (nom)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_Insérer un caractère HTML spécial" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "Remplacement HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "Basculement _HTML" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Remplacement en masse des caractères spéciaux" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Insérer des caractères HTML spéciaux" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Remplacer les caractères spéciaux" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Activer/Désactiver le plugin" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Exporter" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exporte le fichier courant vers différents formats." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Exporter un fichier" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Utiliser le niveau de zoom courant" -#: ../plugins/export.c:193 +#: ../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" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Document exporté avec succès vers '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Le fichier '%s' n'a pu être écrit (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Exporter" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "En _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "En _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Navigateur de fichier" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Ajoute un onglet navigateur de fichiers à la barre latérale." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Trop d'éléments sélectionnés !" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, 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:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Ouvrir à l'_extérieur" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "Rechercher dans les _fichiers" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Afficher les fichiers cac_hés" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Dossier parent" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Actualiser" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Dossier personnel" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Définir le chemin depuis le document" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Effacer le filtre" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filtre :" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Focus sur la liste des fichiers" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Focus sur le chemin" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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éé." @@ -5017,43 +5075,43 @@ "ceci incluant *.o, *.obj. *.so, *.dll, *.a, *.lib" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" -msgstr "Définir le dossier de base du projet" +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 "" -"Modifier le répertoire pour le répertoire de base du projet actuellement " +"Changer le répertoire pour le répertoire de base du projet actuellement " "ouvert" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Actions d'enregistrement" -#: ../plugins/saveactions.c:47 +#: ../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." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Copie de sauvegarde : le dossier n'a pu être créé (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Copie de sauvegarde : le fichier n'a pu être lu (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Copie de sauvegarde : le fichier n'a pu être enregistré (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5061,109 +5119,143 @@ msgstr[1] "Sauvegarde automatique : %d fichiers sauvegardés automatiquement." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Selectionner le dossier" -#: ../plugins/saveactions.c:471 +#: ../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." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Enregistrement automatique" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Valider" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Intervalle de sauvegarde automatique :" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "secondes" -#: ../plugins/saveactions.c:578 +#: ../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" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "_Enregistrer seulement le fichier ouvert courant" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "_Enregistrer tous les fichiers ouverts" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Sauvegarde immédiate" -#: ../plugins/saveactions.c:624 +#: ../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 :" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Copie de sauvegarde" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Dossier de sauvegarde des fichiers :" -#: ../plugins/saveactions.c:686 +#: ../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) :" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "_Niveaux de dossiers à inclure dans la sauvegarde :" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Diviser la fenêtre" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Diviser en deux la fenêtre d'édition" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Afficher le document courant" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Annuler la division" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Diviser la fenêtre" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Horizontalement" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Verticalement" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Diviser horizontalement" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Diviser verticalement" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 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." +#~ msgstr "" +#~ "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é)" @@ -5471,9 +5563,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Structs / Typedefs" -#~ msgid "Show _Full Path Name" -#~ msgstr "Afficher le _chemin complet" - #~ msgid "Terminal emulation:" #~ msgstr "Émulation du terminal :" @@ -5681,10 +5770,6 @@ #~ msgid "Complete construct" #~ msgstr "Créer un constructeur" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Supprimer la complétion automatique" - #~ msgid "Go to tag definition" #~ msgstr "Aller à la définition du symbole" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/hu.po /tmp/ssBwSf4GIv/geany-0.18/po/hu.po --- geany-0.17/po/hu.po 2009-05-01 10:30:08.000000000 +0100 +++ geany-0.18/po/hu.po 2009-08-16 17:18:28.000000000 +0100 @@ -5,9 +5,9 @@ # kilo aka Gabor Kmetyko , 2007, 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: Geany 0.17\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2009-04-30 23:39+0200\n" "Last-Translator: kilo aka Gabor Kmetyko \n" "Language-Team: Hungarian\n" @@ -28,66 +28,68 @@ msgid "Integrated Development Environment" msgstr "Integrált Fejlesztői Felület" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Geany verzió" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Gyors és pehelykönnyű IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Információ" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Fejlesztők" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "karbantartó" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "fejlesztő" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "fordítás karbantartója" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Fordítók" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Előző fordítók" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Hozzájárultak még" -#: ../src/about.c:340 +#: ../src/about.c:342 #, 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):" +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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Közreműködők" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licenc" -#: ../src/about.c:389 +#: ../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." @@ -95,7 +97,7 @@ "A licensz szövege nem található, tekintse meg a http://www.gnu.org/licenses/" "gpl-2.0.txt címen." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -104,134 +106,135 @@ "\"'%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:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Folyamat sikertelen (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (%s könyvtárban)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, 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:731 -msgid "Could not execute the file in the VTE because it probably contains a command." +#: ../src/build.c:707 +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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Fordítás sikertelen." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Fordítás sikerrel lezárult." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Fordítás" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Egyedi cél készí_tése" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Cél _készítése" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Kö_vetkező hiba" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Elő_ző hiba" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../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:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "D_VI fájl megtekintése" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "PD_F fájl megtekintése" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Argumentumok megadása" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Argumentumok megadása" -#: ../src/build.c:1326 +#: ../src/build.c:1313 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." -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "DVI létrehozása:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "PDF létrehozása:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "DVI előnézet:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "PDF előnézet:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -240,70 +243,72 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Adja meg az include állományokat és az argumentumokat" -#: ../src/build.c:1506 +#: ../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." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s parancsok" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Fordítás:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Összeállítás:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Végrehajtás:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Jelenlegi fájl fordítása" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Egyedi cél készítése" -#: ../src/build.c:1927 -msgid "Enter custom options here, all entered text is passed to the make command." +#: ../src/build.c:1918 +msgid "" +"Enter custom options here, all entered text is passed to the make command." 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:1976 +#: ../src/build.c:1967 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:1979 +#: ../src/build.c:1970 msgid "Build the current file with Make and the specified target" -msgstr "Build-eli a jelenlegi fájlt a make eszközzel és a megadott célállománnyal" +msgstr "" +"Build-eli a jelenlegi fájlt a make eszközzel és a megadott célállománnyal" -#: ../src/build.c:1982 +#: ../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:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Nem sikerült végrehajtani a megjelenítő programot" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "A folyamatot nem sikerült leállítani (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Nincs több fordítási hiba." @@ -311,8 +316,8 @@ msgid "Do you really want to quit?" msgstr "Valóban ki szeretne lépni?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "Ú_jraolvasás" @@ -325,51 +330,52 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Biztosan újra akarja olvasni '%s'-t?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Ugrás sorra" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Adja meg a sor számát, ahová ugorni szeretne:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 -msgid "Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 +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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "nn.hh.éééé" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "hh.nn.éééé" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "éééé/hh/nn" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "nn.hh.éééé óó:pp:mm" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "hh.nn.éééé óó:pp:mm" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "éééé/hh/nn óó:pp:mm" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "Egyedi dát_umformátum használata" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Egyedi dátumformátum" -#: ../src/callbacks.c:1495 +#: ../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." @@ -377,24 +383,25 @@ "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:1513 +#: ../src/callbacks.c:1516 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ú)." +msgstr "" +"A dátumformátum stringet nem lehetett átalakítani (feltehetően túl hosszú)." -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Nincs több üzenet." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Fájl megnyitása" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Nézet" -#: ../src/dialogs.c:150 +#: ../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." @@ -402,28 +409,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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Fájl kiterjesztés alapján megállapít" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Fájlból megállapít" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "To_vábbi beállítások" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "_Rejtett fájlokat is megjeleníti" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Kódolás megadása:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -438,11 +445,11 @@ "megnyitásra." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Fájltípus megadása:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -454,23 +461,32 @@ "Figyelem: ha több fájlt választ ki, mindegyik a megadott fájltípusként kerül " "megnyitásra." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "_Felülbírálás" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Fájl mentése" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Átnevezé_s" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Elmenti, majd átnevezi a fájlt" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "Ú_j ablakban nyitja meg a fájlt" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -478,24 +494,41 @@ "Megnyitva hagyja az aktuális dokumentumot és új fülön jeleníti meg az " "újonnan elmentett fájlt" -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Hiba" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Kérdés" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Figyelmeztetés" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Információs" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Ne mentse" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "A(z) '%s' fájl nem kerül mentésre." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Szeretné menteni, mielőtt bezárja?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Betűtípus választása" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -503,106 +536,106 @@ "Hiba történt vagy nem lehetett a fájl információkat kinyerni (pl. új fájl " "esetén)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "ismeretlen" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Tulajdonságok" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Típus:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Méret:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Hely:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Csak olvasható:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(csak a Geany-n belül)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Kódolás:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(BOM-mal)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(BOM nélkül)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Javítva:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Változott:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Legutóbbi elérés:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Engedélyek:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Olvasás:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Írás:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Tulajdonos:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Csoport:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Egyéb:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "%s fájl bezárva." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "\"%s\" új fájl megnyitva." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Nem lehetett megnyitni a(z) %s fájlt (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -617,12 +650,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "A(z) \"%s\" fájl nem érvényes %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -631,48 +664,51 @@ "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:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Szóközök" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabulátorok" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, 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:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Érvénytelen fájlnév" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "%s fájl újraolvasva." -#: ../src/document.c:1354 +#. 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 "%s fájl megnyitva (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", csak olvasható" -#: ../src/document.c:1561 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Hiba a fájl átnevezésekor." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -681,7 +717,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:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -690,51 +726,51 @@ "Hibaüzenet: %s\n" "A hiba itt történt: \"%s\" (sor: %d, oszlop: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Hibaüzenet: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Hiba a fájl mentésekor." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Hiba a fájl mentésekor (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "%s fájl elmentve." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" nem található." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Újbóli keresés a fájl elejétől?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Nincs találat erre: \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: %d előfordulás cserélve, \"%s\" helyett \"%s\"." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Újra akarja olvasni?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -743,32 +779,20 @@ "A(z) '%s' fájl a lemezen újabb, mint a\n" "pufferben lévő aktuális példány." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Újra akarja menteni a fájlt?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "A(z) \"%s\" fájl nem található a lemezen!" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Tabulátor szélessége" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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." @@ -869,133 +893,122 @@ msgstr "Hagyományos kínai" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japán" -#: ../src/encodings.c:141 ../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 "Koreai" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Kódolás nélkül" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Nyugat-európai" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Kelet-európai" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Kelet-á_zsiai" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_DK- & DNy-ázsiai" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "Köz_el-keleti" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Semmi" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s forráskód fájl" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, 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 +msgid "None" +msgstr "Semmi" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Shell szkript fájl" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Make fájl" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML dokumentum" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL fájl" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff fájl" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Config fájl" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext fordítás fájl" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s szkript fájl" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStructuredText fájl" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "_Programozási nyelvek" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Paranc_sértelmezett nyelvek" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "_Jelölő nyelvek" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Egyéb _nyelvek" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Minden forrás" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Minden fájl" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, 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:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "névtelen" @@ -1009,8 +1022,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "láthatatlan" @@ -1018,7 +1031,7 @@ msgid "dummy tooltip, don't translate this." msgstr " " -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "K_ijelölt fájl megnyitása" @@ -1038,11 +1051,11 @@ msgid "Page Set_up" msgstr "Oldal b_eállítása" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "_Többi dokumentum bezárása" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Öss_zeset bezár" @@ -1050,83 +1063,79 @@ msgid "_Edit" msgstr "S_zerkesztés" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "_Mindet kijelöli" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Formázás" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "K_iválasztás kis/nagybetűssé tétele" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "Soro_k megjegyzésbe" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Sorok _megjegyzésből kivétele" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "So_r megjegyzésbe/vissza" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Behúzás _növelése" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Behúzás _csökkentése" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../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:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "A kije_lölés küldése" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "_Megjegyzések beszúrása" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog bejegyzés beszúrása" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "_Fájl fejléc beszúrása" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Függvény _leírás beszúrása" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Többsoros _megjegyzés beszúrása" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "_GPL megjegyzés beszúrása" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "_BSD licensz megjegyzés beszúrása" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "_Dátum beszúrása" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" be_szúrása" @@ -1150,7 +1159,7 @@ msgid "Find in F_iles" msgstr "Keresés _fájlokban" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Csere" @@ -1170,7 +1179,7 @@ msgid "Pr_evious Message" msgstr "_Előző üzenet" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Ugrá_s sorra" @@ -1198,7 +1207,7 @@ msgid "Show Side_bar" msgstr "Oldal_sáv megjelenítése" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Szerkesztő" @@ -1242,15 +1251,15 @@ msgid "In_dent Type" msgstr "Be_húzás típusa" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tabulátorok" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Szóközök" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_abulátorok és szóközök" @@ -1370,7 +1379,7 @@ msgid "_Debug Messages" msgstr "Hi_baüzenetek" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Szimbólumok" @@ -1394,71 +1403,77 @@ msgid "Scribble" msgstr "Firka" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Ké_pek és szöveg" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Csak _képek" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Csak _szöveg" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "_Nagy ikonok" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "K_is ikonok" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "Na_gyon kicsi ikonok" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" msgstr "Eszköztár el_rejtése" -#: ../src/interface.c:2082 +#: ../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:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "_Dokumentum használat keresése" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Ugrás a _címke definíciójához" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Ugrás a címke _deklarációjához" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "_Tartalomfüggő művelet" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Beállítások" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Legutóbbi munkamenet fájljainak betöltése" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Induláskor megnyitja a legutóbbi munkamenetben nyitott fájlokat" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Töltse be a virtuális terminál emulációt" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1466,39 +1481,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:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Engedélyezi bővítőmodulok támogatását" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Indulás" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Ablakméret és elhelyezkedés mentése" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Kilépéskor rákérdez" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Kilépéskor megerősítő ablakot jelenít meg." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Leállás" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Indítókönyvtár:" -#: ../src/interface.c:2758 +#: ../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." @@ -1507,48 +1522,51 @@ "elérési útnak kell lennie. Hagyja üresen az aktuális munkakönyvtár " "használatához." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Tulajdonságok:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 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:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "További bővítőmodulok útvonala:" -#: ../src/interface.c:2808 +#: ../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 "A Geany alapértelmezés szerint a globális telepítési útvonalon és a konfigurációs könyvtárban keres. Az itt megadott útvonalon is keresni fog bővítményeket. Letiltáshoz hagyja üresen." +msgstr "" +"A Geany alapértelmezés szerint a globális telepítési útvonalon és a " +"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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Elérési utak" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Indulás" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 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:2851 +#: ../src/interface.c:2871 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:2853 +#: ../src/interface.c:2873 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:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1556,11 +1574,11 @@ "Átváltson-e az állapot üzenetek listájára (a lenti jegyzettömb ablakban), ha " "új állapot üzenet érkezik?" -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Ne mutasson állapot üzeneteket az állapotsávon" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1568,11 +1586,12 @@ "Eltávolít minden üzenetet az állapotsávról. Az üzenetek ezután is " "megjelennek, az állapot üzenetek ablakon." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, 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:2866 +#: ../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 " @@ -1582,15 +1601,15 @@ "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:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Egyéb" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 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:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1598,11 +1617,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:2893 +#: ../src/interface.c:2913 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:2896 +#: ../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" @@ -1610,19 +1629,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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Keresés" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Projekt-alapú munkamenet fájlok használata" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1630,11 +1649,11 @@ "Eltárolja-e a projekt munkamenet fájljait és megnyissa-e őket a projekt " "újbóli megnyitásakor?" -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "A projekt alapkönyvtárába mentse a projekt fájlt" -#: ../src/interface.c:2929 +#: ../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 " @@ -1646,75 +1665,75 @@ "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:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projektek" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Egyéb" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Általános" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Szimbólum lista megjelenítése" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Ki/bekapcsolja a szimbólumok listáját" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Megnyitott fájlok listájának megjelenítése" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Ki/bekapcsolja a megnyitott fájlok listáját" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Oldalsáv" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Szimbólum lista:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Üzenet ablak:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Szerkesztő:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Beállítja az üzenet ablakban használt betűtípust" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 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:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Beállítja a szerkesztő ablakban használt betűtípust" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Betűtípusok" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Fájl fülek megjelenítése" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Bezáró gombok megjelenítése" -#: ../src/interface.c:3064 +#: ../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)" @@ -1722,105 +1741,112 @@ "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:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Új fájl fülek elhelyezkedése:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Balra" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Jobbra" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "A duplakattintás elrejt minden további felületi elemet" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 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:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Szerkesztő ablak fülek" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Fent" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Lent" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Oldalsáv:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Fülek helye" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Állapotsor megjelenítése" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Felület" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Eszköztár me_gjelenítése" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "Eszköztár _illesztése a menühöz" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 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" +msgstr "" +"Összeilleszti az eszköztárat a főmenüvel a jobb függőleges helykihasználás " +"érdekében" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Eszköztár" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Ikon stílus:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Ikon méret:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Megjelenés" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "_Eszköztár megjelenítése" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Eszköztár" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Sortörés" -#: ../src/interface.c:3349 +#: ../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 " @@ -1830,11 +1856,11 @@ "sortörés magas erőforrásigényű nagy dokumentumok esetén, tehát lassú gépeken " "ki kellene kapcsolni." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "\"Okos\" Home billentyű engedélyezése" -#: ../src/interface.c:3354 +#: ../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 " @@ -1848,11 +1874,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:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Húzd és ejtsd módszer letiltása" -#: ../src/interface.c:3359 +#: ../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" @@ -1860,31 +1886,31 @@ "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:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Blokkok engedélyezése" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Engedélyezi-e a kód blokkokra osztását?" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Kinyitja/bezárja egy blokk összes gyermekét" -#: ../src/interface.c:3369 +#: ../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 "" -"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." +"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:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Jelölés használata fordítási hibák kijelzéséhez" -#: ../src/interface.c:3374 +#: ../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" @@ -1892,23 +1918,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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Soremelés levágja a sorvégi szóközöket" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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." +msgstr "" +"Engedélyezi, hogy soremeléskor az előző sor végéről levágja a szóközöket." -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Sortörés oszlopa:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Megjegyzés jelölő:" -#: ../src/interface.c:3406 +#: ../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." @@ -1916,95 +1943,98 @@ "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:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Sajátságok" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Sajátságok" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Automatikus behúzás üzemmód:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Alap" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Jelenlegi karakterek" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Zárójelek illesztése" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Típus:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Szélesség:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "A behúzás mérete karakterekben" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Behúzás esetén szóközöket használjon" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Behúzás esetén tabulátor karaktert használjon" -#: ../src/interface.c:3510 ../src/interface.c:5058 -msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +#: ../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 "" "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:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Kemény tabulátor szélessége:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 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?" +msgstr "" +"Fájl megnyitásakor megállapítsa-e a fájltartalom alapján a behúzások típusát?" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "A Tab billentyű sorbehúzást csinál" -#: ../src/interface.c:3548 -msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +#: ../src/interface.c:3592 +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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Behúzás" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Behúzás" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Részlet kiegészítése" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2012,19 +2042,20 @@ "Gépeljen be egy meghatározott karaktersort és egészíttesse ki egy " "bonyolultabb szövegre egy gombnyomással." -#: ../src/interface.c:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "XML címke automatikus kiegészítése" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Többsoros megjegyzések automatikus folytatása" -#: ../src/interface.c:3591 +#: ../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" @@ -2032,11 +2063,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:3593 -msgid "Automatic symbol completion" -msgstr "Szimbólumok automatikus kiegészítése" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2044,91 +2075,103 @@ "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:3604 +#: ../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 "Max. szimbólum név ajánlatok:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Kiegészítés lista magassága:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Kiegészítéshez használt karakterek:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 +#, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" "A szimbólumok automatikus kiegészítése listájának megjelenítéséhez szükséges " "karakterek száma." -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +#, 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:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +#, 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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Kiegészítések" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Zárójel ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 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:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Egyszeres idézőjelek ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 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:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Kapcsos zárójelek { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 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:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Szögletes zárójelek [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 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:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Dupla idézőjelek \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 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:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Idézőjelek és zárójelek automatikus bezárása" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Kiegészítések" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Szintaktis jelölő színek átfordítása" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2136,45 +2179,45 @@ "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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Behúzás segédvonalak megjelenítése" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Szóközök megjelenítése" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 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:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Sorvégek megjelenítése" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Megjeleníti a sorvége karaktereket" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Sorszámok megjelenítése" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Ki/bekapcsolja a sorszám margót." -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Jelölő margó megjelenítése" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2182,36 +2225,36 @@ "Ki/bekapcsolja a kis margót a sorszámoktól jobbra, ami a sorok megjelölésére " "szolgál." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Utolsó sornál ne görgessen tovább" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Megjelenés" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Hosszú sor jelölése:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Hosszú sor jelölésének színe:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Megadja a hosszú sor jelző színét" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Színválasztó" -#: ../src/interface.c:3826 +#: ../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 " @@ -2222,11 +2265,11 @@ "nál nagyobb értéket annak meghatározásához, hogy melyik oszlopban jelenjen " "meg a jelölés." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Sor" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2234,11 +2277,11 @@ "Függőleges vonalat húz a szerkesztő ablakban a megadott kurzorpozíciónál " "(ld. lejjebb)." -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Háttér" -#: ../src/interface.c:3846 +#: ../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 " @@ -2247,55 +2290,57 @@ "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:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Kikapcsolva" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Hosszú sor jelző" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Megjelenítés" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Új dokumentum megnyitása parancssorból" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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." +msgstr "" +"Új fájlt hoz létre minden olyan parancssori fájlnév alapján, ami nem létezik." -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Alapértelmezett sorvége karaterek:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Új fájlok" -#: ../src/interface.c:3942 +#: ../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." +msgstr "" +"Beállítja az alapértelmezett kódolást az újonnan létrehozott fájlok esetén." -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Alapértelmezett kódolás (új fájlok):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Alapértelmezett kódolás (létező fájlok):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Meghatározott kódolás használata fájlok megnyitásakor" -#: ../src/interface.c:3978 +#: ../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 " @@ -2305,51 +2350,51 @@ "megnyitásakor, a fájlt a megadott kódolással nyitja meg (általában nem " "szükséges)." -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Kódolások" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Fájl végén legyen új sor" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Sorvégi szóközök és tabulátorok levágása" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Tabulátorok cseréje szóközre" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "A dokumentumban az összes tabulátort szóközökre cseréli." -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Fájlok mentése" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Legutóbbi fájlok listájának hossza:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Lemezellenőrzés gyakorisága:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2357,27 +2402,27 @@ "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:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Fájlok" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminál:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Böngésző:" -#: ../src/interface.c:4138 +#: ../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:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2385,23 +2430,23 @@ "Egy terminál emulátor mint az xterm, a gnome-terminal vagy a konsole " "(kezelnie kell a -e argumentumot)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 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:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Eszközök elérési útjai" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Környezetfüggő parancs:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2412,67 +2457,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:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Parancsok" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Eszközök" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "a fejlesztő e-mail címe" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "A fejlesztő monogramja" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Kezdeti verzió:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Az új fájl kezdeti verziószáma" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Cégnév" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Fejlesztő:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Cég:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "E-mail cím:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Kezdőbetűk:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "A fejlesztő neve" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Év:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Dátum:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Dátum és idő:" -#: ../src/interface.c:4382 +#: ../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." @@ -2481,7 +2526,7 @@ "olyan konverziós jelölés használható, amit az ANSI C strftime függvénnyel " "használni lehet." -#: ../src/interface.c:4389 +#: ../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." @@ -2490,7 +2535,7 @@ "konverziós jelölés használható, amit az ANSI C strftime függvénnyel " "használni lehet." -#: ../src/interface.c:4396 +#: ../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." @@ -2499,80 +2544,83 @@ "konverziós jelölés használható, amit az ANSI C strftime függvénnyel " "használni lehet." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Sablon adatok" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Sablonok" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "_Változtatás" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Gyorsbillentyűk" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Billentyű hozzárendelések" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Parancs:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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)." +msgstr "" +"Elérési út a fájl nyomtatási parancshoz (használjon %f-et a fájlnév helyén)." -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Külső parancs használata nyomtatáshoz" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Sorszámok nyomtatása" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Sorszámozás hozzáadása a nyomtatott oldalon." -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Oldalszámozás nyomtatása" -#: ../src/interface.c:4518 ../src/printing.c:352 -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:4570 ../src/printing.c:387 +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:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Oldal fejléc nyomtatása" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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 "" -"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." +"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:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "A nyomtatott fájlt alap nevének használata" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Dátumformátum:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2582,537 +2630,556 @@ "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:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Natív GTK nyomtatás használata" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Nyomtatás" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Projekt tulajdonságai" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Fájl" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Új" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Megnyit" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Kijelölt fájl megnyitása" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Ment" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Mentés másként" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Mindet menti" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Nyomtat" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Bezár" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Összeset bezár" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Fájl újraolvasása" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Projekt tulajdonságok" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Visszavonás" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Újra" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Sor vagy kiválasztás másolása" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Aktuális sor(ok) törlése" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, 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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Aktuális sorhoz görgeti" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Nézet egy sorral feljebb görgetése" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Nézet egy sorral lejjebb görgetése" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Részlet kiegészítése" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Kurzor mozgatás a részletben" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Részlet kiegészítés felfüggesztése" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Tartalomfüggő művelet" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Szó kiegészítése" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Hívás segítése megjelenítése" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Makró lista megjelenítése" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Vágólap" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Kivágás" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Másolás" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Beillesztés" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Aktuális sor(ok) másolása" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Aktuális sor(ok) kivágása" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Kijelölés" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Mindet kijelöli" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Aktuális szó kiválasztása" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Aktuális sor(ok) kiválasztása" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Aktuális bekezdés kiválasztása" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Formázás" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Kijelölés kis/nagybetűssé tétele" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Sor megjegyzésbe/vissza" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Sor(ok) megjegyzésbe" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Sor(ok) megjegyzésből kivétele" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Behúzás növelése" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Behúzás csökkentése" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Behúzás növelése egy szóközzel" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Behúzás csökkentése egy szóközzel" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Intelligens sorbehúzás" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "1. egyedi parancs" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "2. egyedi parancs" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "3. egyedi parancs" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "A kijelölés küldése a terminálba" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Beszúrás" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Dátum beszúrása" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Másféle szóköz beszúrása" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Beállítások" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Keresés" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Keresés" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Következő" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Előző" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Következő kijelölés" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Előző kijelölés" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Csere" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Keresés fájlokban" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Következő üzenet" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Előző üzenet" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Használat keresése" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Dokumentum használat keresése" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "_Make mindet" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Ugrás sorra" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Visszatérés egy helyhez" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Továbbhaladás egy helyhez" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Illeszkedő zárójelhez ugrás" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Jelölő ki/bekapcsolása" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Következő jelölőhöz ugrás" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Előző jelölőhöz ugrás" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Ugrás a címke definíciójához" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Ugrás a címke deklarációjához" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Ugrás sor elejére" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Ugrás sor végére" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Ugrás sor végére" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Előző szótaghoz ugrás" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Következő szótaghoz ugrás" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Nézet" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Minden egyéb widget ki/bekapcsolása" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Teljes képernyős" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Üzenetablak ki/bekapcsolása" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Oldalsáv ki/bekapcsolása" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Nagyítás" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Kicsinyítés" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Fókusz" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Szerkesztő ablakra kapcsol" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Firka ablakra kapcsol" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "VTE-re kapcsol" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Keresősávra kapcsol" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Oldalsávra kapcsol" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Fordítóra kapcsol" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Jegyzettömb fül" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Baloldali dokumentumra kapcsol" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Jobboldali dokumentumra kapcsol" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "A legutóbb használt dokumentumra kapcsol" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Dokumentum mozgatása balra" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Dokumentum mozgatása jobbra" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Dokumentum mozgatása első helyre" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Dokumentum mozgatása utolsó helyre" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Dokumentum" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Sortörés be/kikapcsolása" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Sor széttördelés be/kikapcsolása" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Szóközök cseréje tabulátorokra" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Aktuális blokk be/kikapcsolása" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Minden blokk bezárása" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Minden blokk kinyitása" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Szimbólum lista újraolvasása" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Összeállítás" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Fordítás" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make mindet" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Egyedi cél készítése" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Következő hiba" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Előző hiba" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Futtatás" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Futtatás (másik paranccsal)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Build opciók" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Színválasztó megjelenítése" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Súgó" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Gyorsbillentyűk" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "A következő gyorsbillentyűk állíthatók be:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "A dokumentumra kapcsol" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Nem sikerült betölteni egy vagy több munkamenet fájlt." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Hibaüzenetek" @@ -3169,8 +3236,8 @@ msgstr "A Geany telepítés prefix nyomtatása" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "ne töltse be az előző munkamenet fájljait" +msgid "Don't load the previous session's files" +msgstr "Ne töltse be az előző munkamenet fájljait" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3184,35 +3251,36 @@ msgid "Show version and exit" msgstr "Verziószám megjelenítése és kilépés" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[FÁJLOK...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Áthelyezi most?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." -msgstr "A konfigurációs könyvtárat sikerült átmásolni innen: \"%s\" ide: \"%s\"." +msgstr "" +"A konfigurációs könyvtárat sikerült átmásolni innen: \"%s\" ide: \"%s\"." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3221,7 +3289,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:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3233,22 +3301,22 @@ "használja.\n" "Mindenképpen elindítja a Geany-t?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Ez a Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, 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:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Beállítások újraolvasása kész." @@ -3264,7 +3332,7 @@ msgid "_Hide Message Window" msgstr "Üzenet ablak el_rejtése" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3273,11 +3341,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:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "_Bővítménykezelő" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3288,23 +3356,23 @@ "Leírás: %s\n" "Szerző(k): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Aktív" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Bővítmény" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Nincs elérhető bővítmény." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Bővítmények" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3312,52 +3380,60 @@ "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:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Bővítmény részletei:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Parancs" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Gyorsbillentyű" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Billentyű beolvasása" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "Mind_et kinyitja" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "Mindet be_zárja" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Parancs" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Gyorsbillentyű" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Felülbírálás" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Felülbírálja ezt a billentyű-hozzárendelést?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, 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." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3365,7 +3441,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:1458 +#: ../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." @@ -3376,7 +3452,7 @@ ">Beállítások újraolvasása menüpont segítségével." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3388,7 +3464,7 @@ "rendelt gyorsbillentyű stringet is szerkesztheti." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3397,17 +3473,8 @@ "re (vagy későbbire) lett fordítva és a Geany GTK 2.10 (vagy későbbi) " "verzión fut." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"Figyelem: Az eszköztár elemeinek testreszabása az 'ui_toolbar.xml' fájl " -"szerkesztésével lehetséges. A részleteket a dokumentációban találja." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3415,46 +3482,54 @@ "Figyelem: ezeket a beállításokat a kurrens projekt felülírja. Ld " "Projekt->Tulajdonságok." -#: ../src/printing.c:270 +#: ../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 "%d. oldal (összesen: %d)" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Dokumentum beállítások" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "%d. oldal (összesen: %d)" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "%s fájl nyomtatása megszakítva." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "%s fájl kinyomtatva." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "%s nyomtatása sikertelen (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 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:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3465,7 +3540,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "\"%s\" nyomtatása sikertelen (visszatérési érték: %s)." @@ -3484,19 +3559,19 @@ msgid "C_reate" msgstr "Lét_rehozás" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Név:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Fájlnév:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Alapkönyvtár:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3506,41 +3581,41 @@ "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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Adja meg a projekt alapkönyvtárát" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, 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:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Projekt megnyitása" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Projekt fájlok" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "\"%s\" projekt bezárva." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Leírás:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Make parancs az alapkönyvtárban" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Parancs indítása:" -#: ../src/project.c:457 +#: ../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." @@ -3548,81 +3623,81 @@ "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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Fájl minták:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Szeretné bezárni, mielőtt folytatja?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "A(z) '%s' projekt már nyitva van." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "A megadott projekt név túl rövid." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Érvénytelen projekt fájlnevet adott meg." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Létre kívánja hozni a projekt alapkönyvtárát?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "A(z) \"%s\" elérési út nem létezik." -#: ../src/project.c:666 +#: ../src/project.c:670 #, 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:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "A projekt fájl nem írható (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "\"%s\" projekt létrehozásra került." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "\"%s\" projekt elmentve." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Adja meg a projekt nevét" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../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:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "\"%s\" projekt megnyitásra került." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Reg_uláris kifejezések használata" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3630,15 +3705,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:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Keresés vi_sszafelé" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "_Escape szekvenciák használata" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3646,396 +3721,406 @@ "Helyettesítse a \\\\, \\t, \\n, \\r és \\uXXXX (Unicode karakterek) jeleket " "a megfelelő vezérlőkarakterekkel." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "_Kis/nagybetű számít" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Csak teljes s_zavak" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "S_zóeleji egyezés" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "Elő_ző" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "Kö_vetkező" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Keresés:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Mindet keresi" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Jelöl" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Megjelöli az összes találatot a jelenlegi dokumentumban." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "M_unkamenetben" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "_Dokumentumban" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Ablak _bezárása" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 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:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Cse_re & Keresés" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "C_sere erre:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Min_det cseréli" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "A kije_lölésben" -#: ../src/search.c:592 +#: ../src/search.c:607 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:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Könyvtár:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "Kód_olás:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "_Fix stringek" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Grep reguláris kifejezések" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 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:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Kibővített reguláris kifejezések" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Alkönyvtá_rakban is" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "Ke_resési eredmények átfordítása" -#: ../src/search.c:782 +#: ../src/search.c:797 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:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "To_vábbi beállítások:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "A Grep-nek átadni kívánt további beállítások" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "%d találat erre: \"%s\"." -#: ../src/search.c:1184 +#: ../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:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Érvénytelen könyvtár a fájlokban keresésnél." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Nincs keresendő szöveg." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Keresés..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (%s könyvtárban)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Nem sikerült megnyitni a könyvtárat (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Nincs találat." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Fejezet" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Alfejezet" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Kiegészítések" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Egyéb" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Típusok" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Típus konstruktorok" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Függvények" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Fejezetek" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Kulcsok" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Változók" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Parancs" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Környezet" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Alfejezet" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Al-alfejezet" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Címke" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Struktúrák" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Csomag" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Saját" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Helyi" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Mienk" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Felületek" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Osztályok" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Konstansok" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Horgonyok" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "H1 Címsor" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "H2 Címsor" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "H3 Címsor" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "ID kiválasztók" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Típus kiválasztók" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Modulok" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletonok" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Eljárások" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Névterek" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Tulajdonságok" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Exportálás" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Tagok" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Címkék" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Eljárások" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blokkok" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "makrók" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Definíciók" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Célok" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Névterek" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Struktúrák" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Típusdefiníciók / Enumerátorok" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Ismeretlen fájlkiterjesztés: \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4044,7 +4129,7 @@ "Használat: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4055,170 +4140,180 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Betöltött címkék" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s címkefájl '%s' betöltésre került." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Nem sikerült betölteni a(z) '%s' címkefájlt." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "\"%s\" előzetes deklarációja nem található." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" definíciója nem található." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "Mind_et kinyitja" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "Mindet be_zárja" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Rendezés _név alapján" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Rendezés megjelenés _alapján" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "A jelenlegi fájl mentése" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Mindet menti" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Minden megnyitott fájl mentése" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Újraolvassa a jelenlegi fájlt a lemezről" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "A jelenlegi fájl bezárása" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Bezár minden megnyitott fájlt" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "A jelenlegi kiválasztás kivágása" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "A jelenlegi kiválasztás másolása" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "A vágólap tartalmának beillesztése" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "A jelenlegi kiválasztás törlése" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Az utolsó változtatás visszavonása" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "A visszavont változtatás ismételt végrehajtása" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Lefordítja a jelenlegi fájlt" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Futtatja vagy megjeleníti a jelenlegi fájlt" -#: ../src/toolbar.c:66 -msgid "Open a color chooser dialog, to interactively pick colors from a palette" +#: ../src/toolbar.c:70 +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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Szöveg nagyítása" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Szöveg kicsinyítése" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Behúzás csökkentése" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Behúzás növelése" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "A megadott szöveg keresése a jelenlegi fájlban" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Ugrás a megadott sorra" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "A beállítások párbeszédablak megjelenítése" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Kilépés a Geany-ből" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Dokumentum nyomtatása" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" -"Az ebben a fájlban történt valamennyi változtatás életbe lépéséhez a Geany " -"újraindítása szükséges." +#: ../src/toolbar.c:80 +#, 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:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Új fájl létrehozása" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Létező fájl megnyitása" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Ugrás" +#: ../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 "Megjelenítés" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4286,123 +4381,144 @@ msgid "Characters:" msgstr "Karakterek:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Nem található címke" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "S_zimbólum lista megjelenítése" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Megnyitott fájlok listájának me_gjelenítése" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Oldalsáv e_lrejtése" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Állapotsor megjelenítése" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "OLV" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "ÁTÍR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "BESZÚR" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP " -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "Üzemmód: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "Kódolás: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "Fájltípus: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MÓDOSÍT" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "Érv.kör: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Betűtípus frissítve (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C Standard Library" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Library)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ Standard Library" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "E_gyedi dátumformátum megadása" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Könyvtár kiválasztása" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Fájl kiválasztása" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "K_onfigurációs fájlok" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Mindet menti" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Összeset bezár" +#: ../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 "Terminál" @@ -4516,7 +4632,8 @@ msgstr "Geany billentyű-hozzárendelések felülbírálata" #: ../src/vte.c:833 -msgid "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" +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)." @@ -4571,161 +4688,145 @@ "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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geany projekt fájlok" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Végrehajtható állományok" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Hiba" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Kérdés" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Figyelmeztetés" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Információs" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Osztály tervező" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Forrásfájlokat készít új osztálytípusokból." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Osztály létrehozása" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Osztály" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Osztály neve:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Fejléc fájl:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Forráskód fájl:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Öröklés" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Szülő osztály:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Szülő fejléc:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Globális" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Szülő GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Beállítások" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Konstruktor létrehozása" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Destruktor létrehozása" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+ típusú konstruktor" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "O_sztály létrehozása" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "_C++ osztály" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "_GTK+ osztály" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML karakterek" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "HTML különleges karaktereket szúr be, pl. '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "A Geany fejlesztői csapat" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML karakterek" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 karakterek" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Görög karakterek" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Matematikai karakterek" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Technikai karakterek" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Nyíl karakterek" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Elválasztás karakterek" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Egyéb karakterek" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Speciális karakterek" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Beszúrás" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4734,156 +4835,157 @@ "használja azt, vagy a gomb segítségével szúrja be azt a jelenlegi kurzor " "pozícióban." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Karakter" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HML (név)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Spec_iális HTML karakterek beszúrása" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "HTML csere" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "_HTMLKapcsoló" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Speciális karakterek csoportos cseréje" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Speciális HTML karakterek beszúrása" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Speciális karakterek cseréje" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Bővítmény állapotának ki/bekapcsolása" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Exportálás" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Különféle formátumokba exportálja az aktuális fájlt." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Fájl exportálása" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "Jelenlegi _nagyítás használata" -#: ../plugins/export.c:193 -msgid "Renders the font size of the document together with the current zoom level" +#: ../plugins/export.c:185 +msgid "" +"Renders the font size of the document together with the current zoom level" msgstr "" "A dokumentum fontméretét a jelenlegi nagyítás mértékének megfelelően " "jeleníti meg." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "A dokumentum exportálása '%s' néven sikeresen megtörtént." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "A(z) '%s' fájlt nem lehetett írni (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Exportálás" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "_HTML formátumban" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "_LaTeX formátumban" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Fájlböngésző" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Az oldalsávon megjelenít egy fájlböngészőt." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Túl sok elem került kiválasztásra!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, 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:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Külső m_egnyitás" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "Keresés _fájlokban" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "_Rejtett fájlok megjelenítése" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Fel" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Frissítés" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Saját könyvtár" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Könyvtárváltás a dokumentum alapján" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Szűrő törlése" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Szűrő:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Fókusz mozgatása a fájl listára" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Fókusz mozgatása az elérési út beviteli mezőre" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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." @@ -4922,138 +5024,172 @@ "obj, *.so, *.dll, *.a, *.lib)" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" +#, fuzzy +msgid "Use the project's base directory" msgstr "Megadja a projekt alapkönyvtárát" #: ../plugins/filebrowser.c:1132 -msgid "Change the directory to the base directory of the currently opened project" +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" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Műveletek mentése" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "Ez a kiegészítő modul különböző műveleteket kínál a fájlok mentéséhez." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Másolat mentése: a könyvtárat nem lehetett létrehozni (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Másolat mentése: A fájl nem olvasható (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Másolat mentése: Fájl mentése nem sikerült (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." msgstr[0] "Automatikus mentés: %d fájl automatikusan mentve." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Könyvtár kiválasztása" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "A mentés könyvtár nem létezik vagy nem írható." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Automatikus mentés" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Engedélyezés" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "Automat_ikus mentés időköze:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "másodperc" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "Írjon ki álla_pot üzenetet, ha automatikusan mentett fájlokat" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Csak az aktuális megnyitott _fájlt mentse" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Mind_en megnyitott fájl mentése" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Azonnali mentés" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "Újonnan megnyitott _fájloknál használandó fájltípus:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Másolat példány" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "Másolato_k mentésének könyvtára:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" -msgstr "Dá_tum/idő formátum a mentés fájlokhoz (\"man strftime\" a részletekért):" +msgstr "" +"Dá_tum/idő formátum a mentés fájlokhoz (\"man strftime\" a részletekért):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "A mentés céljában használt könyvtár szintek:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Ablak felosztása" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "A szerkesztés nézetet két ablakra osztja." -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Megjelöli az összes találatot a jelenlegi dokumentumban." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "Fel_osztás megszüntetése" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "Ablak _felosztása" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Vízszintesen" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "Fü_ggőlegesen" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Felosztás vízszintesen" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Felosztás függőlegesen" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "Felosztás megszüntetése" +#~ msgid "Diff file" +#~ msgstr "Diff fájl" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText fájl" + +#~ msgid "Select _All" +#~ msgstr "_Mindet kijelöli" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Szimbólumok automatikus kiegészítése" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "Figyelem: Az eszköztár elemeinek testreszabása az 'ui_toolbar.xml' " +#~ "fájl szerkesztésével lehetséges. A részleteket a dokumentációban találja." +#~ "" + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "Az ebben a fájlban történt valamennyi változtatás életbe lépéséhez a " +#~ "Geany újraindítása szükséges." diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/it.po /tmp/ssBwSf4GIv/geany-0.18/po/it.po --- geany-0.17/po/it.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/it.po 2009-08-16 17:18:28.000000000 +0100 @@ -1,17 +1,17 @@ # Italian translations for geany package # Traduzioni italiane per il pacchetto geany.. -# Copyright (C) 2006 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2006-2009 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # , 2006. -# , 2006, 2007, 2008 +# , 2006 - 2009 # msgid "" msgstr "" -"Project-Id-Version: Geany 0.16\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" -"PO-Revision-Date: 2008-10-19 22:13+0100\n" -"Last-Translator: Max Baldinelli \n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"PO-Revision-Date: 2009-05-04 21:37+0100\n" +"Last-Translator: Max \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,53 +32,53 @@ msgid "Integrated Development Environment" msgstr "Ambiente di sviluppo integrato" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Informazioni su Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Un IDE veloce e leggero" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(generato il %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Informazioni" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Sviluppatori" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "curatore" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "sviluppatore" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "curatore delle traduzioni" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Traduttori" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Traduttori precedenti" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Contributori" -#: ../src/about.c:340 +#: ../src/about.c:342 #, 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Ringraziamenti" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licenza" -#: ../src/about.c:389 +#: ../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." @@ -102,7 +102,7 @@ "Impossibile trovare il testo della licenza, per consultarlo online visitate " "http://www.gnu.org/licenses/gpl-2.0.txt." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -111,133 +111,133 @@ "Impossibile trovare il terminale \"%s\" (verificare il percorso per il " "terminale nelle preferenze)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Processo fallito (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (nella cartella: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Impossibile cambiare la cartella di lavoro in \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Compilazione fallita." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Compilazione terminata correttamente." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Compila" # http://lists.linux.it/pipermail/tp/2001-July/000665.html #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Compila su _destinazione scelta" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Compila _oggetto" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Errore _successivo" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Errori _precedenti" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "Impo_sta include e argomenti" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_Visualizza il file DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "V_isualizza il file PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Imposta gli argomenti" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Imposta gli argomenti" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Creazione DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Creazione PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Anteprima DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Anteprima PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -246,74 +246,70 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Imposta inclusioni e argomenti" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Imposta i comandi per generare ed eseguire i programmi." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s comandi" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Compila:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Genera:" # Sbagliato tradurlo con esegui poiché si riferisce ai permessi di accesso al file. -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Esecuzione:" -#: ../src/build.c:1901 ../src/toolbar.c:194 -#, fuzzy +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Compila il file corrente" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Compila su destinazione scelta" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Inserire opzioni personalizzate qui; tutto il testo inserito è passato al " "comando «make»." -#: ../src/build.c:1976 -#, fuzzy +#: ../src/build.c:1967 msgid "Build the current file with Make and the default target" -msgstr "Compila il file corrente tramite make verso destinazione predefinita" +msgstr "Compila il file corrente con Make verso destinazione predefinita" -#: ../src/build.c:1979 -#, fuzzy +#: ../src/build.c:1970 msgid "Build the current file with Make and the specified target" -msgstr "Compila il file corrente tramite make la destinazione specificata" +msgstr "Compila il file corrente con Make la destinazione specificata" -#: ../src/build.c:1982 -#, fuzzy +#: ../src/build.c:1973 msgid "Compile the current file with Make" -msgstr "Compila il file corrente" +msgstr "Compila il file corrente con Make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Esecuzione del programma di visualizzazione fallita" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Impossibile interrompere il processo (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Non ci sono altri errori di compilazione." @@ -321,8 +317,8 @@ msgid "Do you really want to quit?" msgstr "Si vuole veramente uscire?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Ripristina" @@ -335,54 +331,54 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Si è sicuri di voler ripristinare '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Vai alla riga" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Inserire la riga a cui si vuole andare:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "gg.mm.aaaa" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.gg.aaaa" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "aaaa/mm/gg" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "gg.mm.aaaa hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.gg.aaaa hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/mm/gg hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Usa il formato di data personalizzato" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Formato di data personalizzato" -#: ../src/callbacks.c:1495 +#: ../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." @@ -391,26 +387,26 @@ "gli specificatori di conversione che è possibile usare nella funzione ANSI C " "strftime." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Non ci sono altri messaggi." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Apri file" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Visualizza" -#: ../src/dialogs.c:150 +#: ../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." @@ -418,29 +414,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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Individua dall'estensione del file" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Individua dal file" -#: ../src/dialogs.c:259 -#, fuzzy +#: ../src/dialogs.c:258 msgid "_More Options" -msgstr "Opzioni" +msgstr "_Altre opzioni" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Mostra file _nascosti" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Imposta _codifica:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -455,11 +450,11 @@ "selezionato." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Imposta il tipo del file:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -471,25 +466,32 @@ "Notare che se si scelgono più file, saranno tutti aperti con il tipo di file " "selezionato." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "_Ridefinisci" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Salva file" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "_Rinomina" -#: ../src/dialogs.c:421 -#, fuzzy +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Salva il file e lo rinomina." -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Apre il file in una nuova scheda" -#: ../src/dialogs.c:431 -#, fuzzy +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -497,24 +499,41 @@ "Mantiene aperto il documento corrente non salvato e apre il file appena " "salvato in una nuova scheda." -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Errore" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Domanda" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Avviso" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informazione" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Non salvare." -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Il file \"%s\" non è salvato." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Si desidera salvarlo prima della chiusura?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Selezionare il tipo di carattere" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -522,48 +541,48 @@ "Si è verificato un errore oppure non si sono potute ottenere le informazioni " "sul file (p.e. da un nuovo file)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "sconosciuto" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Proprietà" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Tipo:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Dimensione:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Posizione:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Sola lettura:" # La frase originale è troppo generica, ho cercato di rendere al meglio la spiegazione del flag. -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(modalità di apertura dei file in Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Codifica:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(con BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(senza BOM)" @@ -572,7 +591,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:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Ultimo editing:" @@ -581,7 +600,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:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Ultima modifica:" @@ -590,54 +609,54 @@ # 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:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Ultimo accesso:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Permessi:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Lettura:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Scrittura:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Proprietario:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Gruppo:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Altri:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "File %s chiuso." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Nuovo file \"%s\" aperto." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Impossibile aprire il file %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -652,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:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Il file \"%s\" non è %s valido." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -668,49 +687,51 @@ # 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:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Spazi" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabulazioni" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Impostati %s come modalità rientro automatico per %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Nome del file non valido" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "File %s ricaricato." -#: ../src/document.c:1354 +#. 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 "File %s aperto(%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", sola lettura" -#: ../src/document.c:1561 -#, fuzzy +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Errore nel salvataggio del file." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -719,7 +740,7 @@ "Si è verificato un errore nella conversione del file da UTF-8 a \"%s\". Il " "file resta non salvato." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -728,52 +749,52 @@ "Messaggio di errore: %s\n" "Errore verificatosi in corrispondenza di: \"%s\" (linea: %d, colonna: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Messaggio di errore: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Errore nel salvataggio del file." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Errore nel salvataggio del file (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "File %s salvato." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" non trovato." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Ricominciare la ricerca dall'inizio?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Nessuna corrispondenza trovata per \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: sostituita %d occorrenza di \"%s\" con \"%s\"." msgstr[1] "%s: sostituite %d occorrenze di \"%s\" con \"%s\"." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Ricaricare il file?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -782,32 +803,20 @@ "Il file '%s' presente sul disco è più recente della\n" "copia che si sta editando." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Provare di nuovo a salvare il file?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "File \"%s\" non trovato." -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Ampiezza delle tabulazioni:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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." @@ -910,135 +919,125 @@ msgstr "Cinese tradizionale" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Giapponese" -#: ../src/encodings.c:141 ../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" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Senza codifica" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "Europee _occidentali" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Europee orientali" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "_Asiatiche orientali" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_SE & SO Asiatiche" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Medio orientali" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Nessuno" - # 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:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Sorgente %s" -#: ../src/filetypes.c:348 +# 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 +#, 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 +msgid "None" +msgstr "Nessuno" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "File script shell" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Documento XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Foglio di stile (CSS)" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "File dump SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "File diff" - # Si riferisce ai config di Geany -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "File di configurazione" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "File delle traduzioni per gettext" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "File script %s" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "File reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Linguaggi di _programmazione" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Linguaggi di _scripting" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Linguaggi a _marcatori" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Linguaggi _vari" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Tutti i file sorgente" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Tutti i file" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Espressione regolare non valida per il tipo di file %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "senza nome" @@ -1054,8 +1053,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "invisibile" @@ -1063,7 +1062,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Apri f_ile selezionato" @@ -1083,11 +1082,11 @@ msgid "Page Set_up" msgstr "_Impostazioni pagina" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Chiude _altri documenti" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "C_hiudi tutto" @@ -1095,91 +1094,85 @@ msgid "_Edit" msgstr "_Modifica" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "_Seleziona Tutto" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Formatta" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Trasf_orma il testo selezionato in maiuscolo o minuscolo" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Commenta Riga" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Decomme_nta Riga" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "_Commenta/decommenta righe" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "_Aumenta Rientro" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "_Diminuisci Rientro" -#: ../src/interface.c:526 ../src/interface.c:1995 -#, fuzzy +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" -msgstr "_Invia selezione a" +msgstr "_Invia la selezione al terminale." -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Invia selezione a" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "In_serisci Commenti" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Inserisci voce del _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Inserisci i_ntestazione del file" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Inserisci descrizione di _funzione" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Inserisci commento _multilinea" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Inserisci il testo della _GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Inserire il testo della licenza _BSD" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Inserisci _Data" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "I_nserisci \"include <...>\"" #: ../src/interface.c:613 -#, fuzzy msgid "Preference_s" -msgstr "Preferenze" +msgstr "Preferen_ze" #: ../src/interface.c:621 msgid "_Search" @@ -1197,7 +1190,7 @@ msgid "Find in F_iles" msgstr "Trova in f_ile" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Sos_tituisci" @@ -1217,7 +1210,7 @@ msgid "Pr_evious Message" msgstr "Messaggio pr_ecedente" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Vai alla _riga" @@ -1245,7 +1238,7 @@ msgid "Show Side_bar" msgstr "Mostra barra _laterale" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1258,19 +1251,16 @@ msgstr "Mostra i numeri di _riga" #: ../src/interface.c:751 -#, fuzzy msgid "Show _White Space" -msgstr "Mostra gli spazi bianchi" +msgstr "Mostra gli spazi _bianchi" #: ../src/interface.c:755 -#, fuzzy msgid "Show Line _Endings" -msgstr "Mostra i fine riga" +msgstr "Mostra i _fine riga" #: ../src/interface.c:759 -#, fuzzy msgid "Show _Indentation Guides" -msgstr "Mostra guide di rientro" +msgstr "Mostra guide di _rientro" #: ../src/interface.c:780 msgid "_Document" @@ -1292,17 +1282,17 @@ msgid "In_dent Type" msgstr "Tipo di in_dentazione" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 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:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Spazi" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_abulazioni e spazi" @@ -1380,9 +1370,8 @@ msgstr "_Apri" #: ../src/interface.c:955 -#, fuzzy msgid "_Recent Projects" -msgstr "Apri progetto" +msgstr "Progetti _recenti" #: ../src/interface.c:959 msgid "_Close" @@ -1427,7 +1416,7 @@ msgid "_Debug Messages" msgstr "Messaggi di _debug" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Simboli" @@ -1453,73 +1442,77 @@ msgid "Scribble" msgstr "Appunti" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Immagini _e testo" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Solo _immagini" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Solo _testo" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Icone _grandi" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Icone _piccole" -#: ../src/interface.c:1760 ../src/interface.c:3306 -#, fuzzy +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" -msgstr "Icone _piccole" +msgstr "Icone _molto piccole" + +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" +msgstr "_Nascondi barra degli strumenti" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" msgstr "_Nascondi barra degli strumenti" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "_Utilizzo del Trova" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "_Utilizzo del Trova" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Vai alla definizione del _tag" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Vai alla dichiarazione del t_ag" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Azione conte_stuale" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Preferenze" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Carica i file dell'ultima sessione" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Apre all'avvio i file dell'ultima sessione" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Carica l'emulatore del terminale virtuale" -#: ../src/interface.c:2690 -#, fuzzy +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1527,41 +1520,40 @@ "Imposta il caricamento dell'emulatore del terminale virtuale (VTE) " "all'avvio. Disabilitarla se non necessaria." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Abilita il supporto dei plugin" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Avvio" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Salva posizione e geometria della finestra" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Conferma l'uscita" -#: ../src/interface.c:2723 -#, fuzzy +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Mostra un dialogo di conferma all'uscita." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Chiusura" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Percorso di avvio:" -#: ../src/interface.c:2758 +#: ../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." @@ -1569,41 +1561,42 @@ "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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "File di progetto:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Percorso iniziale all'apertura dei file di progetto" -#: ../src/interface.c:2796 -#, fuzzy +#: ../src/interface.c:2816 msgid "Extra plugin path:" -msgstr "Abilita il supporto dei plugin" +msgstr "Percorso aggiuntivo dei plugin:" -#: ../src/interface.c:2808 +#: ../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 "" +"Come impostazione predefinita Geany cerca nel percorso globale " +"dell'installazione e nella directory della configurazione. In aggiunta, nel " +"percorso inserito qui si cercheranno i plugin. Per disabilitare, lasciare " +"vuoto." -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Percorsi dei programmi" -#: ../src/interface.c:2826 -#, fuzzy +#: ../src/interface.c:2846 msgid "Startup" -msgstr "Stato" +msgstr "Avvio" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 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:2851 -#, fuzzy +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1611,24 +1604,23 @@ "Emette un suono in caso di errore o quando il processo di compilazione è " "terminato." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 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:2856 -#, fuzzy +#: ../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 "" "Passa alla scheda dei messaggi di stato (nella finestra del blocco note in " -"basso) se un nuovo messaggio di stato arriva." +"basso) in caso di arrivo di un nuovo messaggio di stato." -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Sopprime i messaggi di stato nella barra di stato" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1636,11 +1628,12 @@ "Rimuove tutti i messaggi dalla barra di stato. I messaggi sono ancora " "visibili nella finestra dei messaggi di stato." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Seleziona automaticamente i controlli (il focus segue il mouse)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1651,16 +1644,15 @@ "appunti, la barra delle ricerche e dei salti a linea e per l'emulatore di " "terminale." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Varie" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Ricomincia sempre la ricerca dall'inizio e nascondi la finestra Trova" -#: ../src/interface.c:2891 -#, fuzzy +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1668,12 +1660,11 @@ "Ricomincia sempre la ricerca dall'inizio del documento e nascondi la " "finestra Trova dopo aver scelto Trova il Prossimo/Precedente" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 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:2896 -#, fuzzy +#: ../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" @@ -1681,33 +1672,31 @@ "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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Ricerca" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Usa file di sessione per progetto" -#: ../src/interface.c:2924 -#, fuzzy +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "" -"Per salvare i file della sessione del progetto ed aprirli alla riapertura " -"del progetto." +"Per salvare i file della sessione del progetto e aprirli alla riapertura del " +"progetto." -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Salvare il file di progetto nel percorso base del progetto" -#: ../src/interface.c:2929 -#, fuzzy +#: ../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 " @@ -1719,77 +1708,75 @@ "percorso base. Si può sempre cambiare il percorso del file di progetto nel " "dialogo Nuovo Progetto." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Progetti" -#: ../src/interface.c:2936 -#, fuzzy +#: ../src/interface.c:2956 msgid "Miscellaneous" -msgstr "Varie" +msgstr "Varie" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Generale" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Mostra la lista dei simboli" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Mostra/nasconde la lista dei simboli" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Mostra la lista dei documenti" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Mostra/nasconde la lista dei documenti" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Barra laterale" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Lista dei simboli:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Finestra dei messaggi:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Imposta il carattere per la finestra dei messaggi" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Imposta il carattere per la finestra della lista simboli" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Imposta il carattere dell'editor" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Tipi di carattere" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Mostra le linguette dei file aperti" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Mostra il pulsante Chiudi" -#: ../src/interface.c:3064 -#, fuzzy +#: ../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)" @@ -1798,111 +1785,114 @@ "chiudere facilmente i file con un click su di esso (richiede il riavvio di " "Geany)." -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Posizione delle nuove linguette file:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Sinistra" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Destra" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 -#, fuzzy +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" -msgstr "Mostra/nascondi tutti i controlli aggiuntivi" +msgstr "Doppio click per nascondere tutti i controlli aggiuntivi" -#: ../src/interface.c:3093 -#, fuzzy +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Mostra/nascondi tutti i controlli aggiuntivi" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Linguette dell'editor" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "In alto" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "In basso" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Barra laterale:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Posizioni delle tabulazioni" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Mostra barra di stato" -#: ../src/interface.c:3192 -#, fuzzy +#: ../src/interface.c:3212 msgid "Whether to show the status bar at the bottom of the main window" -msgstr "Mostrare la barra di stato nella finestra principale in basso." +msgstr "Mostra/Nasconde la barra di stato nella finestra principale in basso." -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interfaccia" -#: ../src/interface.c:3222 -#, fuzzy +#: ../src/interface.c:3242 msgid "Show T_oolbar" -msgstr "Mostra barra degli strumenti" +msgstr "Mostra barra degli _strumenti" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" -msgstr "" +msgstr "_Appendi al Menù la barra degli strumenti" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 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:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Barra degli strumenti" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Stile dell'icona:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Dimensioni dell'icona:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Aspetto" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Mostra _barra degli strumenti" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Barra degli strumenti" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "A capo automatico" -#: ../src/interface.c:3349 +#: ../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 " @@ -1913,11 +1903,11 @@ "un alto impatto sulle prestazioni, perciò dovrebbe essere disabilitata su " "macchine lente." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Abilita il tasto Home \"intelligente\"" -#: ../src/interface.c:3354 +#: ../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 " @@ -1931,12 +1921,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:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Disabilita il drag and drop" -#: ../src/interface.c:3359 -#, fuzzy +#: ../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" @@ -1945,20 +1934,19 @@ "modo che non sarà possibile trascinare alcuna selezione all'interno o " "all'esterno della finestra dell'editor." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Contrai/espandi" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Abilita o meno la contrazione/espansione del codice" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Comprimi/Espandi tutti i figli di un punto di contrazione" -#: ../src/interface.c:3369 -#, fuzzy +#: ../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." @@ -1967,12 +1955,11 @@ "Shift mentre si fa click su un simbolo di contrazione si ha il comportamento " "contrario." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Usa indicatori per evidenziare errori di compilazione" -#: ../src/interface.c:3374 -#, fuzzy +#: ../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" @@ -1980,25 +1967,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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "L'andata a capo elimina gli spazi in coda" -#: ../src/interface.c:3379 -#, fuzzy +#: ../src/interface.c:3423 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:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Colonna di interruzione riga:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Marcatore di selezione del commento:" -#: ../src/interface.c:3406 -#, fuzzy +#: ../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." @@ -2006,69 +1991,68 @@ "Stringa da aggiungere quando si seleziona una riga di commento in un file " "sorgente. Usata per marcare il commento come selezionato." -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Funzionalità" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Caratteristiche" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Modalità rientro automatico:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Semplice" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Caratteri correnti" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Mostra parentesi corrispondente" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Ampiezza:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "L'ampiezza in caratteri di una singola indentazione" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Usa gli spazi per indentare" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Usa una tabulazione per indentazione" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 degli spazi se l'indentazione totale è minore dell'ampiezza della " "tabulazione, altrimenti usa entrambi" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Ampiezza delle tabulazioni:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 -#, fuzzy +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -2076,33 +2060,30 @@ "Per determinare il tipo di indentazione dal contenuto del file alla sua " "apertura." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Indentazione di riga intelligente" -#: ../src/interface.c:3548 -#, fuzzy +#: ../src/interface.c:3592 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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Indentazione" -#: ../src/interface.c:3555 ../src/interface.c:5093 -#, fuzzy +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" -msgstr "Indentazione" +msgstr "Indentazione" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Completamento del costrutto" -#: ../src/interface.c:3581 -#, fuzzy +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2110,21 +2091,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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "Completamento automatico dei tag XML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Continuazione automatica di commenti multiriga" -#: ../src/interface.c:3591 -#, fuzzy +#: ../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" @@ -2132,11 +2113,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:3593 -msgid "Automatic symbol completion" -msgstr "Completamento automatico del simbolo" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2144,145 +2125,159 @@ "Completamento automatico di simboli conosciuti nei file sorgente aperti " "(nomi di funzione, variabili globali, ...)" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "" + +#: ../src/interface.c:3646 +#, fuzzy +msgid "Drop rest of word on completion" +msgstr "Disabilita completamento del costrutto" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Numero massimo di suggerimenti per il nome di un simbolo:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Altezza della lista di completamento:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Caratteri da digitare per il completamento:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 #, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" "La quantità di caratteri necessari per mostrare la lista dei simboli per il " "completamento automatico." -#: ../src/interface.c:3640 +#: ../src/interface.c:3692 #, fuzzy -msgid "Display height in rows for the auto completion list" +msgid "Display height in rows for the autocompletion list" msgstr "Numero di righe da mostrare nella lista di completamento automatico." -#: ../src/interface.c:3649 +#: ../src/interface.c:3701 #, fuzzy -msgid "Maximum number of entries to display in the auto completion list" +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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Completamento automatico" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" -msgstr "" +msgstr "Parentesi tonde ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" +"Chiude automaticamente la parentesi tonda quando si digita quella di " +"apertura." -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" -msgstr "" +msgstr "Apici singoli ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 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:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" -msgstr "" +msgstr "Parentesi graffe { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 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:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" -msgstr "" +msgstr "Parentesi quadre [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 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:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" -msgstr "" +msgstr "Virgolette doppie \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 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:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" -msgstr "" +msgstr "Chiusura automatica di virgolette e parentesi" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Completamento automatico" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Inverti i colori dell'evidenziazione della sintassi" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Mostra guide di rientro" -#: ../src/interface.c:3743 -#, fuzzy +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Mostra gli spazi bianchi" -#: ../src/interface.c:3748 -#, fuzzy +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Marca gli spazi con punti e le tabulazioni con frecce." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Mostra i fine riga" -#: ../src/interface.c:3753 -#, fuzzy +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Mostra il carattere di fine riga" -#: ../src/interface.c:3755 -#, fuzzy +#: ../src/interface.c:3807 msgid "Show line numbers" -msgstr "Mostra i numeri di _riga" +msgstr "Mostra i numeri di riga" -#: ../src/interface.c:3758 -#, fuzzy +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Mostra/nasconde il margine dei numeri di riga." -#: ../src/interface.c:3760 -#, fuzzy +#: ../src/interface.c:3812 msgid "Show markers margin" -msgstr "Mostra il margine per i _marcatori" +msgstr "Mostra il margine per i marcatori" -#: ../src/interface.c:3763 -#, fuzzy +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2290,40 +2285,38 @@ "Mostra/nasconde il piccolo margine a destra dei numeri di riga, usato per " "marcare le righe." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Ferma lo scorrimento all'ultima riga" -#: ../src/interface.c:3768 -#, fuzzy +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Display" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Marcatore di righe lunghe:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Colore del marcatore di righe lunghe:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Imposta il colore dei marcatori di riga lunga" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Scelta colori" -#: ../src/interface.c:3826 -#, fuzzy +#: ../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 " @@ -2334,12 +2327,11 @@ "campo ad un valore maggiore di zero per specificare la colonna dove il " "margine deve apparire." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Linea" -#: ../src/interface.c:3839 -#, fuzzy +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2347,12 +2339,11 @@ "Stampa una linea verticale nella finestra dell'editor alla posizione del " "cursore indicata (vedere sotto)." -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Sfondo" -#: ../src/interface.c:3846 -#, fuzzy +#: ../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 " @@ -2362,60 +2353,56 @@ "(vedi sotto) è cambiata al colore impostato sotto (raccomandato se si usano " "caratteri proporzionali)." -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Disabilitato" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Marcatore di margine destro" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Display" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Apre nuovi documenti dalla linea di comando" -#: ../src/interface.c:3895 -#, fuzzy +#: ../src/interface.c:3947 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:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Caratteri predefiniti di fine riga:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "File nuovi" -#: ../src/interface.c:3942 -#, fuzzy +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Codifica predefinita (nuovi file):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Codifica predefinita (file esistenti):" -#: ../src/interface.c:3967 -#, fuzzy +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Usa codifica prefissata per aprire i file" -#: ../src/interface.c:3978 -#, fuzzy +#: ../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 " @@ -2425,53 +2412,51 @@ "all'apertura dei file, e apre i file con la codifica specificata (di solito " "non è necessario)." -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Codifica:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Forza carattere «a capo» a fine file" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Elimina spazi in coda" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Sostituisce le tabulazioni con gli spazi" -#: ../src/interface.c:4012 -#, fuzzy +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Sostituisce tutte le tabulazioni del documento con spazi." -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Salvare i file" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Lunghezza della lista file recenti:" -#: ../src/interface.c:4053 -#, fuzzy +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Timeout per il controllo su disco:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2479,27 +2464,27 @@ "Frequenza di controllo per i cambiamenti a documenti su disco. Il valore " "zero disabilita il controllo." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "File" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminale:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Percorso ed opzioni per il programma «make»" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2507,24 +2492,24 @@ "Un emulatore di terminale simile a xterm, gnome-terminal o konsole (dovrebbe " "accettare l'argomento -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Percorso (e possibilmente argomenti addizionali) del vostro browser preferito" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Percorsi dei programmi" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Azione contestuale:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2535,67 +2520,67 @@ "essere usata con %s. Può trovarsi ovunque nel comando dato e sarà sostituita " "prima dell'esecuzione." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Comandi" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Strumenti" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "Indirizzo di posta elettronica dello sviluppatore" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Iniziali del nome dello sviluppatore" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Versione iniziale:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Numero di versione assegnato inizialmente a un nuovo file" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Nome della società" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Sviluppatore:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Società:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Indirizzo di posta elettronica:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Iniziali:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Il nome dello sviluppatore" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Anno:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Data e ora:" -#: ../src/interface.c:4382 +#: ../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." @@ -2604,7 +2589,7 @@ "usare tutti gli specificatori di conversione che è possibile usare nella " "funzione ANSI C strftime." -#: ../src/interface.c:4389 +#: ../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." @@ -2613,7 +2598,7 @@ "gli specificatori di conversione che è possibile usare nella funzione ANSI C " "strftime." -#: ../src/interface.c:4396 +#: ../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." @@ -2622,88 +2607,84 @@ "gli specificatori di conversione che è possibile usare nella funzione ANSI C " "strftime." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Dati dei modelli" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Modelli" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "_Cambia" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Scorciatoie da tastiera" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Scorciatoie da tastiera" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4480 -#, fuzzy, c-format +#: ../src/interface.c:4532 +#, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Usa un comando esterno per stampare" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Stampa i numeri di riga" -#: ../src/interface.c:4513 ../src/printing.c:347 -#, fuzzy +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Aggiunge i numeri di riga alla pagina stampata." -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Stampa i numeri di pagina" -#: ../src/interface.c:4518 ../src/printing.c:352 -#, fuzzy +#: ../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 "" "Aggiungi i numeri di pagina al piede di ogni pagina. Occupa 2 righe della " "pagina." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Stampa l'intestazione della pagina" -#: ../src/interface.c:4523 ../src/printing.c:357 -#, fuzzy +#: ../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 "" "Aggiunge una piccola intestazione a ogni pagina contenente il numero della " -"pagina, il nome del file e la data corrente (vedere sotto. Occupa 3 righe " +"pagina, il nome del file e la data corrente (vedere sotto). Occupa 3 righe " "della pagina." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Usa il nome base del file stampato" -#: ../src/interface.c:4543 -#, fuzzy +#: ../src/interface.c:4595 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Formato di data:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2713,539 +2694,556 @@ "di ogni pagina. Si possono usare tutti gli specificatori di conversione che " "è possibile usare nella funzione ANSI C strftime." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Usa la funzionalità di stampa nativa di GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Stampa" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Proprietà del progetto" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "File" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nuovo" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Apri" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Apre il file selezionato" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Salva" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Salva come" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Salva tutti" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Stampa" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Chiudi" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Chiudi tutto" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Ricarica file" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Progetto" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Proprietà del progetto" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Annulla" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Ripeti" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Duplica la riga o il testo selezionato" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Cancella la(e) linea(e) corrente(i)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, 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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Scorre alla linea corrente" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Scorre in alto la visualizzazione di una riga" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Scorre in basso la visualizzazione di una riga" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Completa il costrutto" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" -msgstr "" +msgstr "Sposta il cursore nel frammento." -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Disabilita completamento del costrutto" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Azione contestuale" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Completa parola" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Mostra suggerimenti" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Mostra la lista delle macro" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Appunti" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Taglia" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Copia" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Incolla" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Copia la(e) linea(e) corrente(i)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Taglia la(e) linea(e) corrente(i)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Seleziona" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Seleziona tutto" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Seleziona parola corrente" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Seleziona la(e) linea(e) corrente(i)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Seleziona il paragrafo corrente" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Formatta" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Trasforma il testo selezionato in maiuscolo o minuscolo" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Commenta/Decommenta riga" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Commenta la riga" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Decommenta la riga" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Aumenta rientro" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Diminuisci rientro" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Aumenta il rientro di uno spazio" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Diminuisce il rientro di uno spazio" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Indentazione di riga intelligente" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Invia al comando personalizzato n. 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Invia al comando personalizzato n. 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Invia al comando personalizzato n. 3" -#: ../src/keybindings.c:317 -#, fuzzy +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" -msgstr "_Invia selezione a" +msgstr "Invia la selezione al terminale." + +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Inserisci" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Inserisci data" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Usare le tabulazioni all'inserimento di spazi bianchi" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Impostazioni" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Cerca" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Trova" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Trova successivo" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Trova precedente" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Trova prossima selezione" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Trova selezione precedente" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Sostituisci" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Trova in file" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Messaggio successivo" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Messaggio precedente" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Mostra utilizzo" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Uso del Trova Documento" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Co_mpila tutto" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Vai alla riga" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Naviga una posizione indietro" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Naviga una posizione avanti" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Vai alla parentesi corrispondente" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Mostra/nascondi marcatore" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Vai al marcatore successivo" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Vai al marcatore precedente" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Vai alla definizione del tag" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Vai alla dichiarazione del tag" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Vai a inizio riga" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Vai a fine riga" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Vai a fine riga" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Vai al marcatore precedente" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Vai al marcatore successivo" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Visualizza" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Mostra/nascondi tutti i controlli aggiuntivi" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Schermo intero" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Mostra/nasconde la finestra messaggi" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Mostra/nasconde barra laterale" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Aumenta Ingrandimento" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Diminuisci Ingrandimento" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Focus" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Passa all'editor" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Passa agli appunti" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Passa all'emulatore di terminale virtuale" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Passa alla barra di ricerca" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Passa alla barra laterale" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Passa al compilatore" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Scheda del blocco note" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Passa al documento di sinistra" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Passa al documento di destra" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Passa all'ultimo documento usato" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Sposta il documento a sinistra" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Sposta il documento a destra" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Sposta il documento all'inizio" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Sposta il documento alla fine" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "A capo automatico" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Interruzione riga" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Sostituisci gli spazi con caratteri di tabulazione" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Seleziona punto di espansione corrente" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Comprimi tutto" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Espandi tutto" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Ricarica la lista dei simboli" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Genera" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Compila" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Compila tutto" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Compila su destinazione scelta" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Compila oggetto" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Errore successivo" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Errore precedente" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Esegui" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Esegui (comando alternativo)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Opzioni per la generazione" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Mostra il dialogo di scelta colori" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Aiuto" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Scorciatoie da tastiera" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Sono definite le seguenti scorciatoie da tastiera:" -#: ../src/keybindings.c:1530 -#, fuzzy +#: ../src/keybindings.c:1583 msgid "Switch to Document" -msgstr "Passa al documento di sinistra" +msgstr "Passa al documento" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Caricamento di uno o più file della sessione non riuscito." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Messaggi di debug" @@ -3263,7 +3261,7 @@ #: ../src/main.c:126 ../src/main.c:146 msgid "Be verbose" -msgstr "" +msgstr "Messaggi verbosi" #: ../src/main.c:127 msgid "Print internal filetype names" @@ -3275,7 +3273,7 @@ #: ../src/main.c:129 msgid "Don't preprocess C/C++ files when generating tags" -msgstr "" +msgstr "Non preprocessare i file C/C++ quando si generano i tag." #: ../src/main.c:132 msgid "Don't open files in a running instance, force opening a new instance" @@ -3306,7 +3304,8 @@ msgstr "Stampa il prefisso del percorso base dell'installazione di Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" +#, fuzzy +msgid "Don't load the previous session's files" msgstr "Non apre i file di sessioni precedenti" #: ../src/main.c:143 @@ -3321,40 +3320,45 @@ msgid "Show version and exit" msgstr "Mostra le informazioni sulla versione ed esce" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[FILE...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" -msgstr "" +msgstr "Spostare ora?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" "\"." msgstr "" +"La directory di configurazione è stata spostata correttamente da \"%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:649 +#: ../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 "" +"Impossibile spostare la vecchia directory di configurazione \"%s\" in \"%s" +"\" (%s). Spostare manualmente la directory nella nuova posizione." -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3366,22 +3370,22 @@ "configurazione.\n" "Avviare ugualmente Geany?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Impossibile creare la cartella di configurazione (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "File di configurazione ricaricato." @@ -3397,7 +3401,7 @@ msgid "_Hide Message Window" msgstr "_Nascondi la finestra dei messaggi" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3406,11 +3410,11 @@ "Il plugin \"%s\" non è compatibile con questa versione di Geany e dev'essere " "ricompilato." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Gestione _Plugin" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3421,23 +3425,23 @@ "Descrizione: %s\n" "Autore(i): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Attivo" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Nessun plugin disponibile." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Plugin" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3445,50 +3449,58 @@ "Qui sotto è presente una lista di plugin disponibili. Selezionare i plugin " "da caricare all'avvio di Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Dettagli del plugin" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Azione" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Scorciatoia" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Cattura tasto" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "_Espandi tutto" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "C_hiudi tutto" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Azione" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Scorciatoia" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Ridefinisci" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Ridefinire la scorciatoia?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "La combinazione '%s' è già in uso per \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3496,7 +3508,7 @@ "Inserire le informazioni da usare nei modelli. Per i dettagli vedere la " "documentazione." -#: ../src/prefs.c:1458 +#: ../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." @@ -3507,7 +3519,7 @@ "Strumenti -> Ricarica la configurazione." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3519,7 +3531,7 @@ "stringa che rappresenta la scorciatoia." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3528,36 +3540,38 @@ "se Geany è stato compilato con le librerie GTK versione 2.10 o superiore " "e Geany è in esecuzione con la versione 2.10 (o superiore) di GTK." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" +"Attenzione: queste impostazioni sono ridefinite dal progetto corrente. " +"Vedere Progetto->Proprietà." + +#: ../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 "" # I file hanno tre date: # ultimo accesso = ultima volta che si è letto/scritto i dati contenuti nel file # 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:270 +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Pagina %d di %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Impostazione del documento" -#: ../src/printing.c:375 -#, fuzzy +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" msgstr "Stampa solo il nome base (senza il percorso) del file stampato." @@ -3566,32 +3580,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:491 -#, fuzzy, c-format +#: ../src/printing.c:526 +#, c-format msgid "Page %d of %d" -msgstr "Pagina %d di %d" +msgstr "Pagina %d di %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Stampa del file \"%s\" cancellata." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "File %s stampato." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Stampa del file \"%s\" fallita (%s)." -#: ../src/printing.c:832 -#, fuzzy +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." -msgstr "Definire prima un comando di stampa nella finestra delle preferenze" +msgstr "Definire prima un comando di stampa nella finestra delle preferenze." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3602,7 +3615,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Stampa del file \"%s\" fallita (codice errore: %s)" @@ -3621,19 +3634,19 @@ msgid "C_reate" msgstr "C_rea" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nome:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Nome del file:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Percorso base:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3643,41 +3656,41 @@ "nuovo percorso, o una cartella esistente. Si possono usare percorsi relativi " "al nome file del progetto." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Scegliere il percorso base del progetto" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Impossibile caricare il file del progetto \"%s\"." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Apri progetto" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "File di progetto" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Progetto \"%s\" chiuso." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Descrizione:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Compila nel percorso base" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Esegui comando:" -#: ../src/project.c:457 +#: ../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." @@ -3685,81 +3698,81 @@ "Comando da eseguire nella directory base del progetto. È possibile passare " "delle opzioni al comando. Lasciare vuoto per usare il comando predefinito." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Modelli dei nomi di file:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Si desidera chiudere prima di continuare?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Il progetto '%s' è già aperto." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Il nome di progetto specificato è troppo corto." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "È stato specificato un nome di progetto non valido." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Creare il percorso base del progetto?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Il percorso \"%s\" non esiste." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Impossibile creare il percorso base del progetto (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Impossibile salvare il file del progetto (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Progetto \"%s\" creato." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Progetto \"%s\" salvato." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Scegliere il nome del file di progetto" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Scegliere il comando di esecuzione del progetto" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Progetto \"%s\" aperto." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "_Usa espressioni regolari" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3768,16 +3781,15 @@ "dettagliate sull'uso delle espressioni regolari, consultare la " "documentazione." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Cerca all'_indietro" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Usa sequenze di _escape" -#: ../src/search.c:231 -#, fuzzy +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3785,432 +3797,428 @@ "Sostituisci \\\\, \\t, \\n, \\r e \\uXXXX (Caratteri Unicode) con i " "corrispondenti caratteri di controllo." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "_Maiuscole/Minuscole" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Solo parole _intere" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Trova dall'i_nizio della parola" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Precedente" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Successivo" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Cerca:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Trova tutti" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Marca" -#: ../src/search.c:418 -#, fuzzy +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Marca tutte le corrispondenze nel documento corrente." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "Nella sessi_one" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "Nel _documento" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Chiudi _dialogo" -#: ../src/search.c:439 ../src/search.c:603 -#, fuzzy +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Disabilita questa opzione per mantenere aperta la finestra." -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "_Trova & sostituisci" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "_Sostituisci con:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Sostituisci _Tutto" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "Nel testo se_lezionato" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Sostituisci tutte le occorrenze trovate nel testo selezionato" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Cartella:" -#: ../src/search.c:712 -#, fuzzy +#: ../src/search.c:727 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:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Stringhe di lunghezza _fissa" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Espressioni regolari di _grep" -#: ../src/search.c:749 ../src/search.c:757 -#, fuzzy +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "Per maggiori informazioni consultare la pagina di manuale di grep." -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Espressioni regolari estese" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Esegui _ricorsivamente nelle sottocartelle" # Invertire i risultati di ricerca non ha significato. -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Inverti il senso di ricerca" -#: ../src/search.c:782 -#, fuzzy +#: ../src/search.c:797 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:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Opzioni e_xtra:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Altre opzioni da passare a grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "Trovata %d corrispondenza per \"%s\"." msgstr[1] "Trovate %d corrispondenze per \"%s\"." -#: ../src/search.c:1184 +#: ../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:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Cartella non valida per la ricerca nei file." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Nessuna stringa da trovare." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 -#, fuzzy +#: ../src/search.c:1419 msgid "Searching..." -msgstr "Cerca" +msgstr "Ricerca in corso..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (nella cartella: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Impossibile aprire la cartella (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." -msgstr "" +msgstr "Ricerca fallita (vedere Help->Messaggi di debug per i dettagli)." -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Nessuna corrispondenza trovata." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Capitolo" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Sezione" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sez1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sez2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sez3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Appendice" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Altro" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Modulo" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Tipi" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Costruttori di tipo" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Funzioni" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Sezioni" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Tasti" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Variabili" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Comando" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 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:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 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:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Subsubsection" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Etichetta" -#: ../src/symbols.c:630 -#, fuzzy +#: ../src/symbols.c:646 msgid "Structures" -msgstr "Stato" +msgstr "Strutture" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Pacchetto" # NdMax: # my $variabile; # e' una dichiarazione di variabile locale in perl -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "My" # costrutto perl -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" # costrutto perl -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Our" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfacce" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Classi" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Costanti" -#: ../src/symbols.c:666 -#, fuzzy +#: ../src/symbols.c:682 msgid "Anchors" -msgstr "Ancora" +msgstr "Ancore" -#: ../src/symbols.c:667 -#, fuzzy +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Intestazione (H1)" -#: ../src/symbols.c:668 -#, fuzzy +#: ../src/symbols.c:684 msgid "H2 Headings" -msgstr "Intestazione (H1)" +msgstr "Intestazione (H2)" -#: ../src/symbols.c:669 -#, fuzzy +#: ../src/symbols.c:685 msgid "H3 Headings" -msgstr "Intestazione (H1)" +msgstr "Intestazione (H3)" -#: ../src/symbols.c:677 -#, fuzzy +#: ../src/symbols.c:693 msgid "ID Selectors" -msgstr "Nel testo se_lezionato" +msgstr "Selettori di ID" -#: ../src/symbols.c:678 -#, fuzzy +#: ../src/symbols.c:694 msgid "Type Selectors" -msgstr "Costruttori di tipo" +msgstr "Selettori di tipo" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 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:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singoletti" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Metodi" -#: ../src/symbols.c:740 ../src/symbols.c:829 +# 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 +msgid "Namespaces" +msgstr "Namespace" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Proprietà" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Esporta" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Membri" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Etichette" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Subroutine" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blocchi" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Macro" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Define" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Target" -# 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:824 -msgid "Namespaces" -msgstr "Namespace" - -#: ../src/symbols.c:830 -#, fuzzy +#: ../src/symbols.c:856 msgid "Structs" -msgstr "Stato" +msgstr "Strutture" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" -msgstr "" +msgstr "Typedef / Enum" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Estensione sconosciuta per \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "Uso: %s -g \n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4221,180 +4229,180 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Carica tag" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Caricati %s file dei tag '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Impossibile caricare il file dei tag '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Dichiarazione di \"%s\" non trovata." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definizione di \"%s\" non trovata." -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "_Trova tutti" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "C_hiudi tutto" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Ordina per _nome" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Ordina per _aspetto" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Salva il file corrente" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "Salva _tutti" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Salva tutti i file aperti" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Ripristina il file corrente dal disco rigido" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Chiude il file corrente" -#: ../src/toolbar.c:55 -#, fuzzy +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Chiude tutti i file aperti" -#: ../src/toolbar.c:56 -#, fuzzy +#: ../src/toolbar.c:60 msgid "Cut the current selection" -msgstr "Converte lo stato MAIUSCOLO/minuscolo della selezione corrente" +msgstr "Taglia la selezione corrente" -#: ../src/toolbar.c:57 -#, fuzzy +#: ../src/toolbar.c:61 msgid "Copy the current selection" -msgstr "Compila il file corrente" +msgstr "Copia la selezione corrente" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" -msgstr "" +msgstr "Incolla il contenuto della clipboard" -#: ../src/toolbar.c:59 -#, fuzzy +#: ../src/toolbar.c:63 msgid "Delete the current selection" -msgstr "Converte lo stato MAIUSCOLO/minuscolo della selezione corrente" +msgstr "Cancella la selezione corrente" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Annulla l'ultima modifica" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Ripete l'ultima modifica" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Compila il file corrente" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Esegue o visualizza il file corrente" -#: ../src/toolbar.c:66 -#, fuzzy +#: ../src/toolbar.c:70 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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Aumenta ingrandimento" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Diminuisce ingrandimento" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Diminuisci rientro" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Aumenta rientro" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Trova il testo inserito nel file corrente" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 -#, fuzzy +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Vai al numero di riga inserito." -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" -msgstr "" +msgstr "Mostra il dialogo delle preferenze" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Chiude Geany" -#: ../src/toolbar.c:75 -#, fuzzy +#: ../src/toolbar.c:79 msgid "Print document" -msgstr "Documento XML" +msgstr "Stampa il documento." -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Marca tutte le corrispondenze nel documento corrente." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Crea un nuovo file" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Apre un file esistente" -#: ../src/toolbar.c:208 -#, fuzzy +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Vai alla riga" +#: ../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 "Display" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4468,126 +4476,145 @@ # 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:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Nessun riferimento" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Mostra la lista dei _simboli" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Mostra la lista dei _documenti" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "_Nascondi barra laterale" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Mostra il percorso _completo" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %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:200 +#: ../src/ui_utils.c:194 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:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "SSC" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "modo: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "codifica: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "tipo del file: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "ambito: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Carattere aggiornato (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Libreria standard C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "Estensioni ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Libreria Standard C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Libreria standard C++" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Imposta il formato di data personalizzato" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Seleziona cartella" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Seleziona file" -#: ../src/ui_utils.c:1737 -#, fuzzy +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" -msgstr "File di configurazione ricaricato." +msgstr "File di c_onfigurazione" -#: ../src/ui_utils.c:1756 -#, fuzzy +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Salva _tutti" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "C_hiudi tutto" +#: ../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 "Terminale" @@ -4629,7 +4656,6 @@ msgstr "Carattere del terminale:" #: ../src/vte.c:750 -#, fuzzy msgid "Sets the font for the terminal widget" msgstr "Imposta il carattere per il terminale." @@ -4642,12 +4668,10 @@ msgstr "Colore dello sfondo:" #: ../src/vte.c:768 -#, fuzzy msgid "Sets the foreground color of the text in the terminal widget" msgstr "Imposta il colore del testo nel terminale." #: ../src/vte.c:775 -#, fuzzy msgid "Sets the background color of the text in the terminal widget" msgstr "Imposta il colore dello sfondo nel terminale." @@ -4658,7 +4682,6 @@ msgstr "Righe di scorrimento all'indietro:" #: ../src/vte.c:790 -#, fuzzy msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" @@ -4671,7 +4694,6 @@ msgstr "Shell:" #: ../src/vte.c:802 -#, fuzzy msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" @@ -4682,34 +4704,30 @@ msgstr "Scorrere alla pressione dei tasti" #: ../src/vte.c:820 -#, fuzzy msgid "Whether to scroll to the bottom if a key was pressed" -msgstr "Fa scorrere il testo alla pressione di un tasto." +msgstr "Fa scorrere verso il fondo alla pressione di un tasto." #: ../src/vte.c:823 msgid "Scroll on output" msgstr "Scorrere in presenza di output" #: ../src/vte.c:824 -#, fuzzy msgid "Whether to scroll to the bottom when output is generated" -msgstr "Fa scorrere il testo in presenza di output." +msgstr "Fa scorrere verso il fondo quando viene generato dell'output." #: ../src/vte.c:827 msgid "Cursor blinks" -msgstr "" +msgstr "Cursore lampeggiante" #: ../src/vte.c:828 -#, fuzzy msgid "Whether to blink the cursor" -msgstr "Abilita o meno la contrazione/espansione del codice" +msgstr "Abilita/Disabilita il lampeggio del cursore." #: ../src/vte.c:831 msgid "Override Geany keybindings" msgstr "Ridefinisce le scorciatoie da tastiera di Geany" #: ../src/vte.c:833 -#, fuzzy msgid "" "Allows the VTE to receive keyboard shortcuts (apart from focus commands)" msgstr "" @@ -4735,7 +4753,6 @@ msgstr "Segui il percorso del file corrente" #: ../src/vte.c:841 -#, fuzzy 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." @@ -4746,7 +4763,6 @@ msgstr "Non usare script per l'esecuzione" #: ../src/vte.c:847 -#, fuzzy msgid "" "Don't use the simple run script which is usually used to display the exit " "status of the executed program" @@ -4759,7 +4775,6 @@ msgstr "Esegui i programmi nel terminale virtuale." #: ../src/vte.c:851 -#, fuzzy msgid "" "Run programs in VTE instead of opening a terminal emulation window. Please " "note, programs executed in VTE cannot be stopped" @@ -4768,162 +4783,146 @@ "emulazione terminale. Notare che i programmi eseguiti nel terminale virtuale " "non possono essere fermati." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "File di progetto di Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Eseguibili" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Errore" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Domanda" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Avviso" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Informazione" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Creazione di classi" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Crea file sorgente per nuove classi." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Crea classe" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Classe" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Nome della classe:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 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:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "File sorgente:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Ereditarietà" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Classe base:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Intestazione base:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Globale" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "GType base:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Opzioni" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Crea il costruttore" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Crea il distruttore" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Tipo costruttore GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Crea cla_sse" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "Classe _C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "Classe _GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caratteri HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Inserisce entità carattere HTML, come '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Il gruppo di sviluppatori di Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Caratteri HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Caratteri ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Caratteri greci" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Caratteri matematici" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Caratteri tecnici" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Caratteri freccia" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Caratteri di punteggiatura" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Caratteri vari" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Caratteri speciali" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Inserisci data" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4932,162 +4931,157 @@ "di esso oppure usare il pulsante per inserirlo alla posizione corrente del " "cursore." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Carattere" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (nome)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_Inserisci caratteri HTML speciali" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 -#, fuzzy +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" -msgstr "Sostituisci" +msgstr "Sostituzione HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" -msgstr "" +msgstr "Abilita _HTML" -#: ../plugins/htmlchars.c:715 -#, fuzzy +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" -msgstr "Posizione delle nuove linguette file:" +msgstr "Sostituzione di massa dei caratteri speciali" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Inserisce caratteri HTML speciali" -#: ../plugins/htmlchars.c:733 -#, fuzzy +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" -msgstr "Caratteri speciali" +msgstr "Sostituisce i caratteri speciali." -#: ../plugins/htmlchars.c:736 -#, fuzzy +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" -msgstr "Commenta/Decommenta riga" +msgstr "Abilita/Disabilita lo stato dei plugin." -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Esporta" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Esporta il file corrente in formati diversi." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Esporta file" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Usa livello di ingrandimento corrente" -#: ../plugins/export.c:193 -#, fuzzy +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" -"Visualizza la dimensione dei caratteri del documento secondo il livello di " +"Visualizza la dimensione dei caratteri del documento insieme al livello di " "ingrandimento corrente." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Documento esportato come '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Impossibile salvare il file '%s' (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Esporta" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Come _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Come _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Esplorazione file" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Aggiunge una scheda per l'esplorazione dei file alla barra laterale." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Selezionati troppi elementi!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Impossibile eseguire il comando esterno configurato '%s' (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Aprire _esternamente" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Trova in file" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Mostra file _nascosti" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Su" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Aggiorna" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Imposta il percorso dal documento" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Elimina il filtro" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filtro:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Passa alla lista dei file" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Passa al percorso" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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." @@ -5127,41 +5121,40 @@ #: ../plugins/filebrowser.c:1128 #, fuzzy -msgid "Set the project's base directory" -msgstr "Creare il percorso base del progetto?" +msgid "Use the project's base directory" +msgstr "Crea il percorso base del progetto." #: ../plugins/filebrowser.c:1132 -#, fuzzy msgid "" "Change the directory to the base directory of the currently opened project" -msgstr "Crea un diff dal percorso del file attivo corrente" +msgstr "Cambia la directory al percorso base del progetto corrente." -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Azioni per il salvataggio" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" "Questo plugin implementa diverse azioni relative al salvataggio di file." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Copia di backup: Impossibile creare la directory (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Copia di backup: Impossibile leggere il file (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Copia di backup: Impossibile salvare il file (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5169,106 +5162,136 @@ msgstr[1] "Salvataggio automatico: Salvati automaticamente %d file." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Seleziona percorso" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "La directory di backup non esiste o non è scrivibile." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Salvataggio automatico" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Abilita" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Intervallo per il salvataggio automatico:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "secondi" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "" "_Stampa il messaggio di stato se i file sono stati salvati automaticamente" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Salva solo il _file corrente" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Sal_va tutti i file aperti" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Salvataggio istantaneo" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "Imposta la codifica predefinita per i file appena creati." -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Copia di backup" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Directory in cui salvare i file di backup:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" "Formato Data/_Ora per i file di backup (\"man strftime\" per i dettagli):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "_Livelli di directory da includere nella destinazione del backup:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Dividi la finestra" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Divide la vista dell'editor in due finestre." -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Marca tutte le corrispondenze nel documento corrente." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Unisci" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Dividi la finestra" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Orizzontalmente" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" -msgstr "" +msgstr "_Verticalmente" -#: ../plugins/splitwindow.c:422 -#, fuzzy +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" -msgstr "_Orizzontalmente" +msgstr "Dividi orizzontalmente" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" -msgstr "" +msgstr "Dividi verticalmente" -#: ../plugins/splitwindow.c:426 -#, fuzzy +#: ../plugins/splitwindow.c:431 msgid "Unsplit" -msgstr "_Unisci" +msgstr "Unisci" + +#~ msgid "Diff file" +#~ msgstr "File diff" + +#~ msgid "reStructuredText file" +#~ msgstr "File reStructuredText" + +#~ msgid "Select _All" +#~ msgstr "_Seleziona Tutto" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Completamento automatico del simbolo" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "Avvertenza: per personalizzare gli elementi della barra degli " +#~ "strumenti, modificare il file 'ui_toolbar.xml'. Vedere la documentazione " +#~ "per i dettagli." + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "Perche le modifiche effettuate in questo file abbiano effetto, è " +#~ "necessario riavviare Geany." #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "" @@ -5551,9 +5574,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Strutture / Definizioni tipo" -#~ msgid "Show _Full Path Name" -#~ msgstr "Mostra il percorso _completo" - #~ msgid "Terminal emulation:" #~ msgstr "Emulazione terminale:" @@ -5782,10 +5802,6 @@ #~ msgid "Complete construct" #~ msgstr "Crea il costruttore" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Disabilita completamento del costrutto" - #~ msgid "Go to tag definition" #~ msgstr "Vai alla definizione del tag" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/ja.po /tmp/ssBwSf4GIv/geany-0.18/po/ja.po --- geany-0.17/po/ja.po 2009-04-26 20:17:08.000000000 +0100 +++ geany-0.18/po/ja.po 2009-08-16 17:18:28.000000000 +0100 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2009-01-01 13:44+0100\n" "Last-Translator: Chikahiro Masami \n" "Language-Team: Japanese \n" @@ -32,67 +32,67 @@ msgid "Integrated Development Environment" msgstr "統合開発環境" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Geany について" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "高速で軽量な IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(%s 以降にビルド)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "情報" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "開発者" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "保守担当" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "開発者" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "翻訳保守担当" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "翻訳者" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "以前の翻訳者" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "貢献者" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "多くの貢献者の一部です(詳細は %s ファイルを見てください):" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "クレジット" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "ライセンス" -#: ../src/about.c:389 +#: ../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." @@ -100,7 +100,7 @@ "ライセンス文書が見つかりません。オンラインで http://www.gnu.org/licenses/gpl-" "2.0.txt を確認してください。" -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -109,130 +109,130 @@ "端末 \"%s\" が見つかりません（「設定」にある端末ツールのパス設定を確認してく" "ださい）" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "\"%s\" の実行に失敗（開始スクリプトを作成できませんでした）" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "プロセス失敗（%s）" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s（ディレクトリ: %s）" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "作業用ディレクトリを \"%s\" へ変更するのに失敗" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "コマンドが含まれているため、仮想端末でファイルが実行できない" -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "コンパイル失敗" -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "コンパイル完了" #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "コンパイル(_C)" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "オブジェクトをメイク(_O)" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "次のエラー(_N)" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "前のエラー(_P)" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "インクルードと引数を設定(_S)" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "DVI ファイルを表示(_V)" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "PDF ファイルを表示(_I)" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "引数を設定(_S)" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "引数を設定" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" "(La)TeX ファイルのコンパイルや表示を行う、プログラムやオプションを設定します" -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "DVI 作成:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "PDF 作成:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "DVI プレビュー:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "PDF プレビュー:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -241,69 +241,69 @@ "%f は現在のファイル名と置換されます（例：test_file.c）\n" "%e は拡張子を除いたファイル名と置換されます（例：test_file）" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "インクルードと引数の設定" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "ビルドと実行プログラムのためのコマンドを設定します" #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s コマンド" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "コンパイル:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "ビルド:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "実行:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "現在のファイルをビルド" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "カスタムのターゲットをメイク" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "ここに任意のオプションを入力してください。すべての入力されたテキストは make " "コマンドに渡されます。" -#: ../src/build.c:1976 +#: ../src/build.c:1967 msgid "Build the current file with Make and the default target" msgstr "現在のファイルをメイクとデフォルトのターゲットでビルドします" -#: ../src/build.c:1979 +#: ../src/build.c:1970 msgid "Build the current file with Make and the specified target" msgstr "現在のファイルをメイクと指定のターゲットでビルドします" -#: ../src/build.c:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "現在のファイルをメイクを使ってコンパイル" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "表示プログラムの実行に失敗しました" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "プロセスを停止できません（%s）" -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "これ以上ビルドエラーはありません" @@ -311,8 +311,8 @@ msgid "Do you really want to quit?" msgstr "本当に終了しますか?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "再読み込み(_R)" @@ -325,52 +325,52 @@ msgid "Are you sure you want to reload '%s'?" msgstr "'%s' を再読み込みしてもよろしいですか?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "指定行へ移動" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "移動する行番号を指定:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "この機能を使う前に現在のファイルにファイルの種類を設定してください" -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "任意の日付書式を使用する(_U)" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "任意の日付書式" -#: ../src/callbacks.c:1495 +#: ../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." @@ -378,24 +378,24 @@ "ここに任意の日付と時刻の書式を入力してください。ANSI C の strftime 関数で用い" "られる変換指定子が使用できます。" -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "日付書式の文字列が変換できません (おそらく長過ぎます)" -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "これ以上メッセージ項目はありません" #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "ファイルを開く" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "表示(_V)" -#: ../src/dialogs.c:150 +#: ../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." @@ -403,28 +403,28 @@ "ファイルを読み取り専用モードで開きます。複数のファイルを選択して開いた場合、" "すべてのファイルは読み取り専用になります。" -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "拡張子から検出" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "ファイルから検出" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "オプション(_M)" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "隠しファイルを表示(_H)" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "エンコーディングの設定:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -439,11 +439,11 @@ "かれることに注意してください。" #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "ファイルの種類の設定:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -455,23 +455,31 @@ "複数のファイルを選んだときは、すべてのファイルが指定したファイルの種類で開か" "れることに注意してください。" -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "上書きしますか?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "ファイル名は既に存在します!" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "ファイルを保存" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "名前の変更(_E)" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "ファイルを保存して名前を変更します" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "ファイルを新しいタブで開く(_O)" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -479,129 +487,146 @@ "現在の保存されていない文書を開いたまま、新しく保存されたファイルを新しいタブ" "に開きます。" -#: ../src/dialogs.c:622 +#: ../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 "保存しない(_D)" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "ファイル '%s' は保存されていません" -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "閉じる前に保存しますか?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "フォントを選択" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "エラーが発生したかファイル情報が取得できません（例：新しいファイル）" -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "不明" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "プロパティ" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "種類:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "サイズ:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "場所:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "読み取り専用:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "（Geany 内部のみ）" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "エンコーディング:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "（BOM あり）" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "（BOM なし）" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "作成日時:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "更新日時:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "アクセス日時:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "属性:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "読み取り:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "書き込み:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "所有者:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "グループ:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "その他:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "ファイル %s を閉じました" -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "新しいファイル \"%s\" を開きました" -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "ファイル %s を開けません（%s）" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -616,12 +641,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "ファイル \"%s\" は有効な %s ではありません" -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -630,48 +655,51 @@ "ファイル \"%s\" はテキストファイルでないかエンコーディングがサポートされてい" "ません" -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "空白" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "タブ" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "%s インデント形式に設定(ファイル %s )" -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "無効なファイル名" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "ファイル %s を再読み込みしました" -#: ../src/document.c:1354 +#. 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 "ファイル %s を開きました（%d%s）" -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", 読み取り専用" -#: ../src/document.c:1561 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "ファイル名変更中にエラー" -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -680,7 +708,7 @@ "ファイルを UTF-8 から \"%s\" に変換するときにエラーがありました。ファイルは保" "存されていません。" -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -689,51 +717,51 @@ "エラーメッセージ: %s\n" "\"%s\" (行: %d, 桁: %d)でエラー" -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "エラーメッセージ: %s" -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "ファイル保存中にエラー" -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "ファイル保存エラー（%s）" -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "ファイル %s を保存しました" -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" が見つかりません" -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "もう一度折り返して検索しますか?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "\"%s\" に一致するものが見つかりません" -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: %d 個の \"%s\" を \"%s\" と置換しました" -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "再読み込みしますか?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -742,32 +770,20 @@ "ディスク上のファイル '%s' は現在のバッファの内容より\n" "新しいです" -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "ファイルを保存し直しますか?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "ディスク上にファイル \"%s\" が見つかりません" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "タブの幅:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "タブ文字に置き換えられる空白の数を指定" @@ -868,133 +884,122 @@ msgstr "繁体字中国語" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "日本語" -#: ../src/encodings.c:141 ../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 "韓国語" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "エンコーディングなし" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "西ヨ－ロッパ(_W)" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "東ヨーロッパ(_E)" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "東アジア(_A)" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "東南・西南アジア(_S)" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "中東(_M)" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "Unicode(_U)" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "なし" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s ソースファイル" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "%s ファイル" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "なし" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "シェルスクリプトファイル" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML 文書" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "カスケーディングスタイルシート" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL ダンプファイル" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff ファイル" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Config ファイル" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext 翻訳ファイル" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s スクリプトファイル" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStructuredText ファイル" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "プログラミング言語(_P)" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "スクリプト言語(_S)" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "マークアップ言語(_M)" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "その他の言語(_I)" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "すべてのソース" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "すべてのファイル" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "ファイル種類 %s の regex が不正です: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "untitled" @@ -1008,8 +1013,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "非表示" @@ -1017,7 +1022,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "選択されたファイルを開く(_I)" @@ -1037,11 +1042,11 @@ msgid "Page Set_up" msgstr "ページ設定(_U)" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "他のファイルを閉じる(_H)" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "すべて閉じる(_L)" @@ -1049,83 +1054,79 @@ msgid "_Edit" msgstr "編集(_E)" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "すべて選択(_A)" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "書式(_F)" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "選択範囲の大文字と小文字を反転(_O)" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "行をコメント化(_C)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "行のコメント化を解除(_N)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "行のコメント化を反転(_T)" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "行/選択範囲を複製(_P)" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "インデントを増やす(_I)" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "インデントを減らす(_D)" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "選択範囲を端末に送る(_S)" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "選択範囲を送る(_S)" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "コメントを挿入(_N)" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "ChangeLog エントリを挿入(_C)" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "ファイルのヘッダを挿入(_H)" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "関数の説明を挿入(_F)" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "複数行コメントを挿入(_M)" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "GPL 通知を挿入(_G)" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "BSD ライセンス通知を挿入(_B)" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "日付を挿入(_E)" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" 文を挿入(_I)" @@ -1149,7 +1150,7 @@ msgid "Find in F_iles" msgstr "複数のファイルから検索(_I)" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "置換(_R)" @@ -1169,7 +1170,7 @@ msgid "Pr_evious Message" msgstr "前のメッセージ(_E)" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "指定行へ移動(_G)" @@ -1197,7 +1198,7 @@ msgid "Show Side_bar" msgstr "サイドバーを表示(_B)" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "エディタ" @@ -1241,15 +1242,15 @@ msgid "In_dent Type" msgstr "インデント形式(_D)" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "タブ(_T)" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "空白(_S)" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "タブと空白(_A)" @@ -1369,7 +1370,7 @@ msgid "_Debug Messages" msgstr "デバッグメッセージ(_D)" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "シンボル" @@ -1393,71 +1394,75 @@ msgid "Scribble" msgstr "走り書き" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "画像とテキスト(_A)" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "画像のみ(_I)" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "テキストのみ(_T)" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "大きいアイコン(_L)" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "小さいアイコン(_S)" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "最小のアイコン(_V)" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "ツールバーをカスタマイズ(_C)" + +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" msgstr "ツールバーを隠す(_H)" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "使い方を検索(_U)" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "文書の説明を検索(_D)" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "タグ定義に移動(_T)" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "タグ宣言に移動(_A)" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "ユーザ定義コマンド(_X)" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "設定" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "最後のセッションからファイルを読み込む" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "起動時に最後のセッションからファイルを開く" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "仮想端末サポートを読み込む" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1465,39 +1470,39 @@ "起動時に仮想端末エミュレーション(VTE)を読み込むかどうか指定します。不要なら無" "効にできます。" -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "プラグインサポートを有効にする" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "起動時" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "ウィンドウ位置とサイズを保存する" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "ウィンドウの位置とサイズを保存し、次回の起動時に復元します" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "終了時に確認する" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "終了時に確認ダイアログを表示します" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "終了時" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "起動時のパス:" -#: ../src/interface.c:2758 +#: ../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." @@ -1505,51 +1510,51 @@ "ファイルを開いたり保存するのに使用するパスです。必ず絶対パスで指定します。空" "白にすると、現在のディレクトリを使用します。" -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "プロジェクトファイル:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "プロジェクトファイルを開くときに使用するパスです。" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "プラグインのパス" -#: ../src/interface.c:2808 +#: ../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 はインストール先と、環境設定が保存されているパスからプラグインを" -"検索します。ここで指定したパスからもプラグインを検索するようになります。" -"指定しないときは空欄のままにしてください。" +"Geany はインストール先と、環境設定が保存されているパスからプラグインを検索し" +"ます。ここで指定したパスからもプラグインを検索するようになります。指定しない" +"ときは空欄のままにしてください。" -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "パス" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "起動/終了" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "エラーやコンパイル終了時にビープ音を鳴らす" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "エラー発生時やコンパイル終了時にビープ音を鳴らすかどうか指定します" -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "新しいメッセージがあるとき、ステータスメッセージリストに切り替える" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1557,11 +1562,11 @@ "新しいステータスメッセージを受けとったとき、ステータスメッセージリストに切り" "替えます。" -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "ステータスバーのステータスメッセージを抑制する" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1569,11 +1574,11 @@ "ステータスバーのすべてのメッセージを消去します。メッセージはステータスメッ" "セージリストに残っています。" -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" -msgstr "ウィジェットに自動的にフォーカス（マウスに追従します）" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" +msgstr "自動フォーカスウィジェット（マウスに追従します）" -#: ../src/interface.c:2866 +#: ../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 " @@ -1583,15 +1588,15 @@ "ディタウィジェット、走り書き、ツールバーの中の検索や行番号フィールド、仮想端" "末エミュレーションがマウスに従ってフォーカスされます。" -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "その他" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "常に折り返して検索し、検索ダイアログを隠す" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1599,11 +1604,11 @@ "文書の先頭/末端から折り返して、常に文書全体を検索します。次を検索/前を検索を" "クリックすると検索ダイアログを非表示にします。" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "検索ダイアログはカーソル位置にある単語を使用する" -#: ../src/interface.c:2896 +#: ../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" @@ -1611,30 +1616,30 @@ "文字列を選択せずに検索または置換ダイアログを表示すると、カーソル位置にある単" "語を検索文字列として使用します" -#: ../src/interface.c:2898 +#: ../src/interface.c:2918 msgid "Use the current file's directory for Find in Files" msgstr "検索に現在のディレクトリのファイルを使用" -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "検索" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Geany プロジェクトのセッションファイルの使用" -#: ../src/interface.c:2924 +#: ../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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "プロジェクトファイルをプロジェクトの基本ディレクトリに保存しますか?" -#: ../src/interface.c:2929 +#: ../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 " @@ -1642,79 +1647,79 @@ "Project dialog." msgstr "" "有効にすると、新しいプロジェクトを作成するときに、プロジェクトファイルがプロ" -"ジェクトのディレクトリに保存されます。無効にすると、ディレクトリの１" -"つ上のディレクトリに保存されます。新規プロジェクトダイアログで、プロジェクト" -"ファイルのパスを変更することも可能です。" +"ジェクトのディレクトリに保存されます。無効にすると、ディレクトリの１つ上の" +"ディレクトリに保存されます。新規プロジェクトダイアログで、プロジェクトファイ" +"ルのパスを変更することも可能です。" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "プロジェクト" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "その他" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "全般" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "シンボルリストの表示" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "シンボルリストのオン／オフを切り替える" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "文書リストを表示" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "文書リストのオン／オフを切り替える" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "サイドバー" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "シンボルリスト:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "メッセージウィンドウ:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "エディタ:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "メッセージウィンドウのフォントを指定" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "シンボルリストのフォントを指定" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "エディタのフォントを指定" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "フォント" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "エディタタブを表示" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "閉じるボタンを表示" -#: ../src/interface.c:3064 +#: ../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)" @@ -1722,105 +1727,109 @@ "ファイルタブに小さな×印のボタンを表示し、クリックすると簡単にファイルを閉じる" "ことができます(Geanyの再起動が必要)" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "新規ファイルタブの配置:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "左" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "ファイルタブは左側に配置されます" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "右" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "ファイルタブは右側に配置されます" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "ダブルクリックによって、全ての追加ウィジェットを非表示にします" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "ファイルタブをダブルクリックすると、エディタ領域を最大にします" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "エディタタブ" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "上" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "下" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "サイドバー:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "タブ位置" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "ステータスバーを表示" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 msgid "Whether to show the status bar at the bottom of the main window" msgstr "ステータスバーをメインウィンドウの下部に表示するかどうか" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "インターフェース" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "ツールバーを表示(_O)" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "メニューにツールバーを追加(_A)" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "メインメニューにツールバーを縦に収納する" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "ツールバー" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "アイコンのスタイル:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "アイコンのサイズ:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "外観" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "ツールバーをカスタマイズ" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "ツールバー" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "行の折り返し" -#: ../src/interface.c:3349 +#: ../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 " @@ -1829,11 +1838,11 @@ "ウィンドウの境界で行を折り返し、次の行に続けます。注意: 大きな文書で行を折り" "返すと処理時間がかかるので、遅いコンピュータでは使わないでください。" -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "\"スマート\" ホームキーを有効にする" -#: ../src/interface.c:3354 +#: ../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 " @@ -1845,11 +1854,11 @@ "い文字へ移動させます。すでにそこにある場合は、行頭へ移動します。この機能が無" "効の場合、HOME キーは常にキャレットを現在行の初めに移動します。" -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "ドラッグアンドドロップを無効にする" -#: ../src/interface.c:3359 +#: ../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" @@ -1858,19 +1867,19 @@ "ンドウの内部または外部で文字を選択してもドラッグアンドドロップに使用できませ" "ん。" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "折りたたみを有効にする" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "コードの折りたたみを有効にするかどうか" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "折りたたみ位置のすべてのコードを表示/非表示" -#: ../src/interface.c:3369 +#: ../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." @@ -1878,11 +1887,11 @@ "折りたたみ位置のすべてのコードを表示または非表示にします。シフトキーを押しな" "がら折りたたマーカをクリックすることでも可能です。" -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "インジケータをコンパイルエラーの表示に使う" -#: ../src/interface.c:3374 +#: ../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" @@ -1890,23 +1899,23 @@ "コンパイラがエラーや警告をした行を強調表示するためにインジケータ(ギザギザの下" "線)を使用するかどうかを指定します" -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "改行時に行末の空白を除去" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "改行時に行末の空白を除去します" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "行の自動改行:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "行コメント文字列:" -#: ../src/interface.c:3406 +#: ../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." @@ -1914,64 +1923,64 @@ "「行をコメント化」コマンドを実行したときに、ソースファイルに追加される文字" "列。その行がコメントになったことを表すために使われます。" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "機能" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "機能" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "自動インデント:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "基本" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "現在の文字数" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "括弧の対応" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "形式:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "幅:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "１つのタブ文字に対する文字幅を文字数で指定" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "インデントに空白を使用" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "インデントにタブを使用" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "インデントがタブの幅に満たない場合は、タブと空白を併用" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "タブの幅:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -1979,30 +1988,30 @@ "ファイルが開かれたときに、ファイルの内容からインデントのタイプを検出するかど" "うか" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "タブキーによるインデント" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "タブ文字を挿入する代わりに、タブキーを押すとインデントし、シフトとタブキーを" "押すとインデントを解除する" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "インデント" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "インデント" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "スニペット補完" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2010,21 +2019,21 @@ "数文字のフレーズを入力すると、候補になる文字列が表示され、1つのキーを押すだけ" "で入力が完了します" -#: ../src/interface.c:3583 -msgid "XML tag auto completion" -msgstr "XML タグの自動補完" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" +msgstr "XMLタグの自動補完" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "XMLタグを入力すると、それを閉じるタグが自動的に補完されます(HTMLタグも補完さ" "ます)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "複数行コメントを自動挿入" -#: ../src/interface.c:3591 +#: ../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" @@ -2032,11 +2041,11 @@ "コメント記述中にEnterキーを押したとき、C, C++, Java言語のような複数行コメント" "を自動継続します" -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "自動シンボル補完" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "自動補完シンボル" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2044,89 +2053,97 @@ "編集中のファイルの既知のシンボルが自動的に補完されます(関数名、グローバル変数" "名、その他のシンボル)" -#: ../src/interface.c:3604 +#: ../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 "シンボル名候補数:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "補完リストの行数:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "補完するためにタイプする文字数:" - -#: ../src/interface.c:3631 -msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" -msgstr "自動シンボル補完リストを表示させるのに必要な文字数を指定します" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" +msgstr "自動補完を表示する文字数:" -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" -msgstr "自動補完リストとして表示する行数を指定します" +#: ../src/interface.c:3683 +msgid "" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" +msgstr "シンボル自動補完リストを表示させるのに必要な文字数を指定します" + +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" +msgstr "自動補完リストの行数" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" -msgstr "自動補完リストとして表示する個数を指定します" +#: ../src/interface.c:3701 +msgid "Maximum number of entries to display in the autocompletion list" +msgstr "自動補完リストとして表示する項目数" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "補完" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "括弧の補完 ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "開括弧を入力すると閉括弧を補完する" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "単一引用符の補完 ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "引用開始を入力すると引用終了を補完する" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "波括弧の補完 {}" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "開波括弧を入力すると閉波括弧を補完する" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "角括弧の補完 [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "開角括弧を入力すると閉角括弧を補完する" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "二重引用符の補完" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "二重引用開始を入力すると二重引用終了を補完する" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "引用符と括弧の自動補完" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "補完" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "構文色分けの色を反転" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2134,78 +2151,78 @@ "黒地に白文字を使用し、すべての色を反転します。このオプションはGeanyの再起動が" "必要です。" -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "インデント位置を表示" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "右インデント位置を示すために破線を表示します" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "空白を表示" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "空白を点で、タブを矢印で表示します" -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "行末を表示" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "行末文字を表示します" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "行番号を表示" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "行番号を表示する領域を確保/解除します" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "行マーカーを表示" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "行番号の右に、行マーカーを表示する領域を確保/解除します" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "最後の行でスクロールしない" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "文書の最後の行でさらに1ページ分スクロールするかどうか" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "表示" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "長い行のマーカー:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "長い行のマーカーの色:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "長い行のマーカーの色を設定します" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "色の選択" -#: ../src/interface.c:3826 +#: ../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 " @@ -2215,22 +2232,22 @@ "るヒントになります。長い行のマーカーが表示される桁数として、0より大きい値を設" "定します。" -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "線" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" "エディタウィンドウの指定したカーソル位置に縦線を表示します(サンプルを確認)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "背景色" -#: ../src/interface.c:3846 +#: ../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 " @@ -2239,56 +2256,56 @@ "現在のカーソル位置にある文字の背景色を次の色に設定します。(プロポーショナル" "フォントを使用しているときは、この機能を有効にしてください)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "無効" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "長い行のマーカー" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "表示" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "コマンドラインから新しい文書を作成" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" "存在しないファイル名をコマンドラインに指定すると、新しい文書を作成します" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "デフォルトの改行文字:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "新規ファイル" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 msgid "Sets the default encoding for newly created files" msgstr "新しく作成するファイルのデフォルトのエンコーディングを設定します" -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "デフォルトのエンコーディング（新規ファイル）:" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "デフォルトのエンコーディング（存在するファイル）:" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 msgid "Sets the default encoding for opening existing files" msgstr "既存のファイルを開くときのデフォルトのエンコーディングを設定します" -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "ファイルを開くときのエンコーディングを固定する" -#: ../src/interface.c:3978 +#: ../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 " @@ -2298,51 +2315,51 @@ "ルを開くときの、ファイルのエンコーディングの自動検出を無効にします。(この機能" "は通常使われません)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "エンコーディング:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "ファイルの終端に改行を追加" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 msgid "Ensures that at the end of the file is a new line" msgstr "ファイルの終端に改行を追加します" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "行末の空白とタブを除去" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "行末の空白やタブを除去します" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "タブを空白に置換" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "文書のすべてのタブを空白で置換します" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "ファイルの保存" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" -msgstr "最近使ったファイルのリストの長さ:" +msgstr "最近使ったファイルの項目数:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 msgid "Specifies the number of files which are stored in the Recent files list" -msgstr "最近使ったファイルのリストに保存されるファイルの数を指定します" +msgstr "最近使ったファイル一覧に保存されるファイル数を指定します" -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "ディスク チェック タイムアウト時間" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2350,27 +2367,27 @@ "ディスク上の文書ファイルが変更されているかどうかを確認する頻度を秒単位で指定" "します。0は確認しません。" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "ファイル" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "メイク:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "端末:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "ブラウザ:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "メイクのパスとオプション" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2378,23 +2395,23 @@ "xterm や gnome-terminal、konsole のような端末エミュレータ（-e 引数が利用でき" "るもの）" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "あなたのお気に入りのブラウザのパス(と必要なオプション)を指定" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "ツールのパス" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "ユーザ定義コマンド:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2404,67 +2421,67 @@ "ユーザ定義コマンドを指定。現在選択中の単語を %s で指定できます。指定したコマ" "ンドはどこでも表示でき、コマンド実行の時に現在の単語に置き換えられます。" -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "コマンド" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "ツール" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "開発者の email アドレス" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "開発者の頭文字" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "初期バージョン:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "新規ファイルが最初に持つバージョン番号" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "会社名" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "開発者:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "会社:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "メールアドレス:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "頭文字:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "開発者の名前" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "年:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "日:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "日時" -#: ../src/interface.c:4382 +#: ../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." @@ -2472,7 +2489,7 @@ "{datetime}の書式を指定してください。ANSI C の strftime 関数で用いられる変換指" "定子が使用できます。" -#: ../src/interface.c:4389 +#: ../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." @@ -2480,7 +2497,7 @@ "{year}の書式を指定してください。ANSI C の strftime 関数で用いられる変換指定子" "が使用できます。" -#: ../src/interface.c:4396 +#: ../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." @@ -2488,62 +2505,61 @@ "{date}の書式を指定してください。ANSI C の strftime 関数で用いられる変換指定子" "が使用できます。" -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "テンプレートのデータ" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "テンプレート" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "変更(_H)" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "ショートカットキー" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "キーバインド" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "コマンド:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "ファイルを印刷するコマンドのパス（ファイル名は %f を使用）" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "外部コマンドを印刷に使用する" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "行番号を印刷" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "行番号を印刷ページに追加します" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "ページ番号を印刷" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "" -"ページ番号をページ下部に追加します。２行分を必要とします。" +msgstr "ページ番号をページ下部に追加します。２行分を必要とします。" -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "ページのヘッダを印刷" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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." @@ -2551,19 +2567,19 @@ "すべてのページにページ番号、ファイル名、現在の日付を含む小さなヘッダを追加し" "ます。3行分を必要とします。" -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "印刷ファイルのベース名を使用" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" msgstr "印刷ファイルのベース名（パスを除いたもの）のみを印刷します" -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "日付の書式:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2572,535 +2588,551 @@ "ページのヘッダに付加されるタイムスタンプの書式を指定してください。ANSI C の " "strftime 関数で用いられる変換指定子が使用できます。" -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "ネイティブな GTK の印刷機能を使用" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "印刷" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "プロジェクトのプロパティ" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "ファイル" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "新規" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "開く" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "選択されたファイルを開く" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "保存" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "別名で保存" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "すべて保存" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "印刷" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "閉じる" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "すべて閉じる" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "再読み込み" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "プロジェクト" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "プロジェクトのプロパティ" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "元に戻す" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "やり直し" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "行/選択範囲を複製" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "現在の行を削除" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +msgid "Delete to line end" +msgstr "行末まで削除" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "現在の行と直前の行を入れ替える" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "現在の行へスクロール" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "１行上へスクロール" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "１行下へスクロール" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "スニペットを補完" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "スニペットにカーソルを移動" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "スニペット補完を抑制する" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "ユーザ定義コマンド" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "単語を補完" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "コールチップを表示" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "マクロリストを表示" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "クリップボード" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "切り取り" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "コピー" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "貼り付け" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "現在の行をコピー" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "現在の行をカット" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "選択" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "すべて選択" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "現在の単語を選択" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "現在の行を選択" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "現在の段落を選択" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "書式" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "選択範囲の大文字と小文字を反転" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "行のコメント化を反転" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "行をコメント化" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "行のコメント化を解除" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "インデントを増やす" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "インデントを減らす" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "インデントを空白１文字増やす" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "インデントを空白１文字減らす" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "スマート行インデント" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "カスタムコマンド 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "カスタムコマンド 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "カスタムコマンド 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "選択範囲を端末に送る" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "複数行/ブロックを整形" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "挿入" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "日付を挿入" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "複数の空白を挿入" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "設定" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "検索" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "検索" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "次を検索" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "前を検索" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "選択文字列を検索" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "選択文字列を前に検索" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "置換" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "複数のファイルから検索" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "次のメッセージ" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "前のメッセージ" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "使い方を検索" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "文書の使い方を検索" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "すべてメイク" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "指定行へ移動" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "元の位置に戻る" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "次の位置に進む" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "対応する括弧へ移動" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "マーカーを切り替える" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "次のマーカーへ移動" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "前のマーカーへ移動" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "タグ定義へ移動" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "タグ宣言へ移動" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "行頭に移動" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "行末に移動" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "表示行の末端に移動" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "前の単語へ移動" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "次の単語に移動" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "表示" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "すべての追加ウィジェットを反転" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "全画面表示" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "メッセージウィンドウを表示" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "サイドバーを表示" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "拡大" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "縮小" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "フォーカス" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "エディタに切り替える" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "走り書きに切り替える" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "VTE に切り替える" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "検索バーに切り替える" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "サイドバーに切り替える" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "サイドバーに切り替える" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "走り書きタブ" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "左の文書に切り替える" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "右の文書に切り替える" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "最後に使用した文書に切り替える" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "文書を左に移動" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "文書を右に移動" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "文書を先頭に移動" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "文書を末尾に移動" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "文書" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "行の折り返し" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "自動改行" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "タブを空白で置換" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "行の折りたたみ" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "すべて折りたたみ" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "すべて広げる" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "シンボルリストを再読込" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "ビルド" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "コンパイル" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "すべてメイク" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "カスタムターゲットをメイク" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "オブジェクトをメイク" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "次のエラー" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "前のエラー" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "実行" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "実行（代替コマンド）" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "ビルドオプション" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "色の選択" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "ヘルプ" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "ショートカットキー" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "以下のショートカットキーが設定できます:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "文書に切り替える" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "メモとして、ここには自由に入力できます。" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "セッションファイルの読み込みに失敗" -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "メッセージ" @@ -3157,7 +3189,7 @@ msgstr "Geanyのインストール先ディレクトリを表示" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "以前のセッションファイルを読み込みません" #: ../src/main.c:143 @@ -3172,24 +3204,24 @@ msgid "Show version and exit" msgstr "バージョンを表示して終了" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[ファイル...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "今移動しますか?" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany を起動する前に、古い設定ディレクトリを移動する必要があります" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3198,7 +3230,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3207,7 +3239,7 @@ "古い設定ディレクトリ \"%s\" を \"%s\" に移動できません(%s)。手作業で移動して" "ください。" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3218,22 +3250,22 @@ "設定ディレクトリなしでGeanyを使うと問題が起きる場合があります。\n" "それでも Geany を実行しますか?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "ファイル '%s' が見つかりません" -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Geany %s を起動しました" -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "設定ディレクトリが作成できませんでした(%s)" -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "設定ファイルを読み込み直しました" @@ -3249,7 +3281,7 @@ msgid "_Hide Message Window" msgstr "メッセージウィンドウを隠す(_H)" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3258,11 +3290,11 @@ "プラグイン \"%s\" は この Geany のリリースとバイナリ互換性がありません - 再コ" "ンパイルしてください。" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "プラグインマネージャ(_P)" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3273,23 +3305,23 @@ "説明: %s\n" "作者: %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "アクティブ" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "プラグイン" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "プラグインが利用できません" -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "プラグイン" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3297,49 +3329,57 @@ "以下は利用できるプラグインのリストです。Geany の起動時に読み込まれるプラグイ" "ンを選択してください。" -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "プラグインの詳細:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "アクション" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "ショートカット" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "キーの読み取り" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "\"%s\"を使用するためのキーの組み合わせをタイプします" -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "すべて展開(_E)" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "すべて閉じる(_C)" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "アクション" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "ショートカット" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "変更(_O)" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "ショートカットキーを変更しますか?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "キーの組み合わせ '%s' は \"%s\" に割り当て済みです" #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "ツールのパスを下に入力してください。不要なツールは空白のままで構いません。" #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3347,7 +3387,7 @@ "テンプレートで使われる情報を入力してください。詳細はドキュメントを参照してく" "ださい。" -#: ../src/prefs.c:1458 +#: ../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." @@ -3357,7 +3397,7 @@ "す。またはツールメニューから設定の再読み込みを行ってください。" #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3368,7 +3408,7 @@ "表現を直接編集するには２回クリックします。" #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3376,17 +3416,8 @@ "注意: ネイティブな GTK の印刷機能は、Geany が GTK 2.10 以上でビルドされ、" "GTK 2.10 以上で実行されていると利用可能になります。" -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"注意: ツールバー要素をカスタマイズするには、'ui_toolbar.xml' ファイルを編" -"集してください。詳細はドキュメントを参照してください。" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3394,44 +3425,52 @@ "注意: これらの設定は現在のプロジェクトによって上書きされています。プロ" "ジェクト->プロパティを確認してください。" -#: ../src/printing.c:270 +#: ../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 "ページ %d / %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "文書の設定" -#: ../src/printing.c:375 +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" msgstr "印刷ファイルのベース名（パスを除いたもの）のみを印刷します" -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "ページ %d / %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "ファイル %s の印刷は中止されました。" -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "ファイル %s は印刷されました。" -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "%s の印刷に失敗しました（%s）。" -#: ../src/printing.c:832 +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." msgstr "先に設定ダイアログで印刷コマンドを設定してください" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3442,7 +3481,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "\"%s\" の印刷に失敗(リターンコード: %s)" @@ -3461,19 +3500,19 @@ msgid "C_reate" msgstr "作成(_R)" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "プロジェクト名:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "ファイル名:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "基本パス:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3483,41 +3522,41 @@ "と既存のディレクトリのいずれかを指定できます。プロジェクトのファイル名に間接" "パスが使用できます。" -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "プロジェクトの基本パスを選択" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "プロジェクトファイル \"%s\" は読み込めませんでした" -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "プロジェクトを開く" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "プロジェクトファイル" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "プロジェクト \"%s\" を閉じました" -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "説明:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "基本パスでメイク" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "実行コマンド:" -#: ../src/project.c:457 +#: ../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." @@ -3525,81 +3564,81 @@ "プロジェクトの基本パスで実行するコマンド。コマンドにオプションを追加できま" "す。標準の実行コマンドを使うときは空白にします。" -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "ファイルパターン:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "実行する前にプロジェクトを閉じますか?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "'%s' プロジェクトはすでに開いています" -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "指定したプロジェクト名は短すぎます" -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "指定したプロジェクト名は長すぎます(最大 %d 文字)" -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "無効なプロジェクト名を指定しました" -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "プロジェクトの基本パスのディレクトリを作成しますか?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "パス \"%s\" は存在しません" -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "プロジェクト基本ディレクトリが作成できません(%s)" -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "プロジェクトファイルが書き込めません（%s）" -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "プロジェクト \"%s\" 作成しました" -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "プロジェクト \"%s\" を保存しました" #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "プロジェクトのファイル名を選択" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "プロジェクトの実行コマンドを選択" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "プロジェクト \"%s\" を開きました" -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "正規表現を使用(_U)" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3607,15 +3646,15 @@ "POSIX 風の正規表現を使用します。正規表現の使用についてはドキュメントを読んで" "ください。" -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "後方を検索(_B)" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "エスケープシーケンスを使用(_E)" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3623,390 +3662,398 @@ "\\\\, \\t, \\n, \\r および \\uXXXX (Unicode 文字)を対応する制御文字に置き換え" "ます" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "大文字と小文字を区別する(_A)" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "完全一致(_W)" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "前方一致(_T)" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "前へ(_P)" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "次へ(_N)" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "検索文字列(_S):" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "すべて検索(_F)" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "マーク(_M)" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "現在の文書で一致するものすべてにマークします" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "セッション内(_O)" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "文書内(_I)" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "ダイアログを閉じる(_D)" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "ダイアログを開いたままにするには、このオプションを無効にしてください" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "置換して検索(_N)" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "置換文字列(_H):" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "すべて置換(_P)" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "選択範囲内(_L)" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "現在選択されているテキストで一致しているものをすべて置換します" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "ディレクトリ(_D):" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "エンコーディング(_N):" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "固定文字列(_T)" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "正規表現(_G)" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "詳細は grep のマニュアルページを参照してください" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "拡張正規表現(_E)" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "サブフォルダを再帰的に検索(_R)" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "検索結果を反転する(_I)" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "検索文字列に合致しない行を選択するには、検索結果を反転してください" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "追加オプション(_X):" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Grep に渡すその他のオプション" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "%d 個の一致するものが見つかりました( \"%s\" を検索)" -#: ../src/search.c:1184 +#: ../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:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "複数のファイルから検索するときに無効なディレクトリ" -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "検索するテキストがありません" -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "grep ツール '%s' が実行できません。パス設定を確認してください。" -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "検索中..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (ディレクトリ: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "ディレクトリを開けませんでした (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "検索に失敗しました(ヘルプのデバッグメッセージを確認してください)。" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "%d 個の一致するものが見つかりました" -#: ../src/search.c:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "一致するものが見つかりません" -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "章" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "節" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "節1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "節2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "節3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "付録" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "モジュール" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../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:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "型コンストラクタ" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "セクション" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "コマンド" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "環境" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "サブセクション" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "サブサブセクション" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "ラベル" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "構造体" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "パッケージ" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "私の" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "ローカル" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "私達の" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "定数" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "アンカー" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "見出し (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "見出し (H2)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "見出し (H3)" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "ID 選択" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Type 選択" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "モジュール" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "シングルトン" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "名前空間" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "手続き" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "インポート" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "メンバ" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "ラベル" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "サブルーチン" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "ブロック" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "マクロ" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "定義" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "ターゲット" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "名前空間" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "構造体" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedef と Enum" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "\"%s\" は不明なファイル形式の拡張子です\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "タグが見つからないため、タグファイルの作成に失敗しました\n" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4015,7 +4062,7 @@ "使用法: %s -g <タグファイル> <ファイルリスト>\n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4026,167 +4073,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "タグを読み込む" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Geany タグファイル (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s タグファイル '%s' を読み込みました" -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "タグファイル '%s' を読み込めませんでした" -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "前方宣言 \"%s\" が見つかりません" -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" の定義が見つかりません" -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "すべて展開(_E)" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "すべて閉じる(_C)" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "名前順に並び替え(_N)" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "出現順に並び替え(_A)" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "現在のファイルを保存" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "すべて保存" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "全ての開いているファイルを保存" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "ディスクから現在のファイルを読み直す" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "現在のファイルを閉じる" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "すべての開いているファイルを閉じる" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "選択中の範囲を切り取り" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "選択中の範囲をコピー" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "クリップボードの内容を貼り付け" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "選択中の範囲を削除" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "最後の変更を取り消し" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "最後の変更の取り消しを元に戻す" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "現在のファイルをコンパイル" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "現在のファイルを実行/表示" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "色選択ダイアログを表示し、パレットから色を選択する" -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "文字を拡大" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "文字を縮小" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "インデントを減らす" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "インデントを増やす" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "指定した文字列を現在のファイルから検索" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "指定した行番号に移動" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "設定ダイアログを表示" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Geany を終了" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "文書を印刷" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "変更した内容を反映するには、Geany の再起動が必要です" +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "現在の文書の文字を置き換えます" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "新しいファイルを作成します" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "存在するファイルを開きます" -#: ../src/toolbar.c:208 +#: ../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 +msgid "Displayed Items" +msgstr "表示される項目" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4254,123 +4312,143 @@ msgid "Characters:" msgstr "文字数:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "タグが見つかりません" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "シンボルリストを表示(_Y)" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "文書リストを表示(_D)" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "サイドバーを隠す(_I)" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "パスを表示(_P)" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "行: %d\t 桁: %d\t 選択: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "モード: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "エンコーディング: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "ファイルの種類: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "スコープ: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "フォントを更新しました(%s)" -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C 標準ライブラリ" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++（C 標準ライブラリ）" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ 標準ライブラリ" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "任意の日付書式を設定(_S)" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "フォルダを選択" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "ファイルを選択" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "設定ファイル(_O)" -#: ../src/ui_utils.c:1756 +#: ../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 "端末" @@ -4532,161 +4610,145 @@ "端末エミュレーションウィンドウを開くかわりに、VTEの中でプログラムを実行しま" "す。VTEの中で実行したプログラムは中止できないことに注意してください。" -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geany プロジェクトファイル" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "実行ファイル" -#: ../src/win32.c:575 -msgid "Error" -msgstr "エラー" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "質問" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "警告" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "情報" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "クラスビルダー" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "新しいクラスのソースファイルを作成します" -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "クラスを作成" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "クラス" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "クラス名:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "ヘッダファイル:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "ソースファイル:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "継承" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "基本クラス:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "基本ヘッダ:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "グローバル" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "基本 GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "オプション" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "コンストラクタを作成" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "デストラクタを作成" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+ コンストラクタ型" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "クラスを作成(_S)" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "_C++ クラス" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "_GTK+ クラス" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML 記号" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "'&' のような HTML 文字実体を挿入します" -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Geany 開発チーム" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML 記号" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 記号" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "ギリシャ文字" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "数学記号" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "技術記号" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "矢印" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "句読記号" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "その他の記号" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "特殊記号" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "挿入(_I)" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4694,156 +4756,155 @@ "以下のリストから特殊記号を選択して、ダブルクリックするかボタンを使用して現在" "のカーソル位置に挿入します" -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "記号" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML（実体）" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "特殊 HTML 記号を挿入(_I)" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "HTML 置換" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "HTML 反転(_T)" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "特殊記号の一括置換" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "特殊 HTML 記号を挿入" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "特殊記号を置換" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "プラグインの状態を反転" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "エクスポート" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "現在のファイルを別の形式にエクスポートします" -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "ファイルをエクスポート" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "現在のズームレベルを使用(_U)" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" -msgstr "" -"文書のフォントサイズを現在のズームレベルでレンダリングします" +msgstr "文書のフォントサイズを現在のズームレベルでレンダリングします" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "文書は正常に '%s' へエクスポートされました" -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "ファイル '%s' は書き込めませんでした（%s）" -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "ファイル '%s' はすでに存在します。上書きしますか?" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "エクスポート(_E)" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "_HTML 文書" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "_LaTeX 文書" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "ファイルブラウザ" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "ファイルブラウザのタブをサイドバーに追加します" -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "選択された項目が多すぎます!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "設定された外部コマンド '%s' が実行できませんでした（%s）" -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "外部から開く(_E)" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "複数のファイルから検索(_F)" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "隠しファイルを表示(_H)" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "上へ" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "更新" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "ホーム" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "パスを文書から設定" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "フィルタをクリア" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "フィルタ:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "ファイルリストをフォーカス" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "パス入力をフォーカス" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "プラグインの設定ディレクトリを作成できませんでした" @@ -4882,143 +4943,171 @@ "o, *.obj. *.so, *.dll, *.a, *.lib を含みます" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" -msgstr "プロジェクトの基本ディレクトリを設定" +msgid "Use the project's base directory" +msgstr "プロジェクトの基本ディレクトリを使用" #: ../plugins/filebrowser.c:1132 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "現在開かれているプロジェクトの基本ディレクトリに作業ディレクトリを変更" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "アクションを保存" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" "このプラグインはファイル保存時に、複数のアクションを選択できるようにします" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "バックアップ: ディレクトリが作成できません(%s)" #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "バックアップ: ファイルが読み込めません(%s)" -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "バックアップ: ファイルが保存できません(%s)" -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." msgstr[0] "自動保存: %d ファイルを自動的に保存しました" #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "ディレクトリを選択" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "バックアップ ディレクトリが存在しないか書き込めません" -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "自動保存" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "有効(_E)" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "自動保存間隔(_I):" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "秒" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "ファイルが自動的に保存されたらステータスメッセージを表示する(_P)" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "現在開いているファイルのみ保存(_F)" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "すべての開いているファイルを保存(_V)" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "簡易保存" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "新しく作成するファイルのファイルの種類(_F):" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "バックアップ" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "バックアップを保存するディレクトリ(_D):" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "バックアップファイルの日時の書式(_T)(\"man strftime\" を参照):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "バックアップ先に指定するディレクトリのレベル(_L):" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "ウィンドウを分割" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "編集ビューを2つのウィンドウに分割する" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "現在の文書を表示" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "ウィンドウを結合(_U)" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "ウィンドウを分割(_S)" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "左右に分割(_H)" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "上下に分割(_V)" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "左右に分割" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "上下に分割" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "ウィンドウを結合" +#~ msgid "Diff file" +#~ msgstr "Diff ファイル" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText ファイル" + +#~ 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 の表示に失敗（すでにコンパイルされているか確認してください）" @@ -5192,9 +5281,6 @@ #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "デバッグモードで実行(多くのメッセージを表示)" -#~ msgid "Show _Full Path Name" -#~ msgstr "完全なパス名を表示(_F)" - #, fuzzy #~ msgid "Found %d matches for \"%s\"." #~ msgid_plural "Found %d matches for \"%s\"." diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/ko.po /tmp/ssBwSf4GIv/geany-0.18/po/ko.po --- geany-0.17/po/ko.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/ko.po 2009-08-16 17:18:28.000000000 +0100 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Genany 0.16\n" +"Project-Id-Version: Genany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2008-10-14 19:27+0100\n" "Last-Translator: Frank Lanitz \n" "Language-Team: Korean\n" @@ -29,67 +29,67 @@ msgid "Integrated Development Environment" msgstr "통합 개발 환경" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "지니 프로그램정보" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "빠르고 가벼운 통합개발환경" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(제작일: %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "프로그램정보" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "개발" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "관리" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "개발" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "번역 관리" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "번역" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "이전 번역" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "공헌" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "많은 개발자 (상세목록파일 %s 참고) 중 몇사람:" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "공헌" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "사용권" -#: ../src/about.c:389 +#: ../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." @@ -97,7 +97,7 @@ "사용권 문서를 찾을 수 없습니다. http://www.gnu.org/licenses/gpl-2.0.txt를 보" "십시오." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -105,129 +105,129 @@ msgstr "" "터미널(\"%s\") 오류: 기본 설정 메뉴의 터미널에서 경로가 정확한지 확인요망" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "\"%s\" 실행실패: start-script 만들 수 없음" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "프로세스 실패: (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (폴더: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "작업 폴더를 \"%s\"(으)로 바꾸기 실패" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "VTE의 파일이 명령을 포함하고 있기때문에 실행할 수 없음." -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "컴파일 실패함." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "성공적으로 컴파일 완료함." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "컴파일(_C)" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Make 맞춤타겟(_T)" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make 오브젝트(_O)" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "다음 오류(_N)" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "이전 오류(_P)" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "연결파일 및 인수 설정(_S)" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> DVI(_D)" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> PDF(_P)" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "DVI 파일 보기(_V)" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "PDF 파일 보기(_i)" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "인수 지정(_S)" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "인수 설정" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "(La)TeX 파일을 컴파일하고 보기위한 프로그램 및 옵션 설정." -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "DVI 만들기:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "PDF 만들기:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "DVI 미리보기:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "PDF 미리보기:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -236,71 +236,71 @@ "%f: 현재 파일 이름으로 바꾸기, 예) test_file.c\n" "%e: 확장자 없는 현재 파일 이름으로 바꾸기, 예) test_file" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "연결파일 및 인수 설정" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "프로그램 제작 및 실행 명령 설정." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s 명령" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "컴파일:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "제작:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "실행:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 #, fuzzy msgid "Build the current file" msgstr "현재 파일 컴파일" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make: 맞춤타겟" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "입력한 맞춤 옵션을 make 명령으로 넘겨줍니다." -#: ../src/build.c:1976 +#: ../src/build.c:1967 #, fuzzy msgid "Build the current file with Make and the default target" msgstr "현재 파일을 make 도구를 사용해서 제작 (기본타겟)" -#: ../src/build.c:1979 +#: ../src/build.c:1970 #, fuzzy msgid "Build the current file with Make and the specified target" msgstr "현재 파일을 make 도구를 사용해서 제작 (맞춤타겟)" -#: ../src/build.c:1982 +#: ../src/build.c:1973 #, fuzzy msgid "Compile the current file with Make" msgstr "현재 파일 컴파일" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "프로그램 보기 실행 실패" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "프로세스 중단 실패 (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "제작오류 더이상 없음." @@ -308,8 +308,8 @@ msgid "Do you really want to quit?" msgstr "정말로 끝낼까요?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "다시 열기(_R)" @@ -322,52 +322,52 @@ msgid "Are you sure you want to reload '%s'?" msgstr "정말로 '%s' 파일을 다시 불러올까요" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "줄번호로 이동" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "이동하고 싶은 줄번호 입력:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "이 기능을 사용하기 전에 파일형식을 지정하십시오." -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "일일.월월.년년년년" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "월월.일일.년년년년" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "년년년년/월월/일일" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "일일.월월.년년년년 시시:분분:초초" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "월월.일일.년년년년 시시:분분:초초" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "년년년년/월월/일일 시시:분분:초초" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "맞춤 날짜 형식 사용(_U)" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "맞춤 날짜 형식" -#: ../src/callbacks.c:1495 +#: ../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." @@ -375,24 +375,24 @@ "원하는 날짜와 시간 형식을 입력하십시오. ANSI C strftime함수의 모든 식별기호 " "사용가능." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "날짜형식 변환 실패: 너무 김." -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "메시지 아이템 더이상 없음." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "파일 열기" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "보기(_V)" -#: ../src/dialogs.c:150 +#: ../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." @@ -400,29 +400,29 @@ "읽기전용으로 파일 열기. 하나 이상의 파일을 열으면 모든 파일은 읽기전용으로열" "립니다." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "파일 확장자로 추정" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "파일에서 추정" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "옵션" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "숨김파일 보기(_h)" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "인코딩 설정:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -437,11 +437,11 @@ "게 됩니다." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "파일형식 설정:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -453,24 +453,33 @@ "주의:만약 다수의 파일을 선택할 때에는 그 모든 파일들은 지정한 파일형식으로열" "리게 됩니다." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "변경(_O)" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "파일 저장" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "이름 바꾸기(_e)" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 #, fuzzy msgid "Save the file and rename it" msgstr "파일을 저장하고 이름 바꾸기." -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "새로운 탭에 파일 열기(_O)" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -478,24 +487,41 @@ msgstr "" "저장되지 않은 현재파일을 그대로 두고, 새로운 탭에 새로운 저장된 파일 열기." -#: ../src/dialogs.c:622 +#: ../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 "저장하지 않기(_D)" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "'%s' 파일이 저장되지 않았음." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "닫기 전에 저장하시겠습니까?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "글꼴 고르기" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -503,106 +529,106 @@ "오류가 발생했거나 파일 정보를 가져올 수 없음\n" "(예: 저장하지 않은 새 파일)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "알 수 없음" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "속성" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "형식:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "크기:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "위치:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "읽기전용:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(지니 내부에서만)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "인코딩:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(BOM과 함께)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(BOM 없이)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "수정:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "바뀜:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "접근:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "허가:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "읽기:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "쓰기:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "소유자:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "그룹:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "%s 파일 닫음." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "새로운 \"%s\" 파일 열음." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "%s 파일 열 수 없음 (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -618,61 +644,64 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "\"%s\" 파일은 올바르지 않은 %s 입니다." -#: ../src/document.c:1030 +#: ../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 "\"%s\" 파일은 텍스트 파일이 아니거나 지원되지 않는 인코딩 형식입니다." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "스페이스" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "탭" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "%2$s 파일 %1$s 들여쓰기모드 설정." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "올바르지 않은 파일 이름" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "%s 파일 다시 불러옴." -#: ../src/document.c:1354 +#. 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 "%s 파일 열음(%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", 읽기전용" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "파일 저장 오류." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -681,7 +710,7 @@ "UTF-8로부터 변환이 \"%s\"에서 실패함.\n" " 파일 저장되지 않음." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -690,83 +719,71 @@ "오류 메시지: %s\n" "\"%s\"에서 오류 발생(%d행, %d열)" -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "오류 메시지: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "파일 저장 오류." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "%s 파일 저장 오류." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "%s 파일 저장됨." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" 없음." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "다시 처음부터 찾을까요?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "\"%s\" 찾을 수 없음." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: %d번 \"%s\" -> \"%s\" 바꿈." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "다시 불러올까요?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." msgstr "디스크에 있는 '%s' 파일이 현재 버퍼보다 새롭습니다." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "다시 저장할까요?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "\"%s\"파일 없음" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "윈도우 (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "매킨토시 (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "유닉스 (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "탭 너비 입력" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "탭을 몇개의 스페이스로 구성할지 입력하시오." @@ -867,133 +884,122 @@ msgstr "중국어 번체" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "일본어" -#: ../src/encodings.c:141 ../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 "한국어" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "인코딩 없음" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "서유럽(_W)" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "동유럽(_E)" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "동아시아(_A)" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "동남 & 서남 아시아(_S)" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "중동아시아(_M)" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "유니코드(_U)" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "없음" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s 소스 파일" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "%s 소스 파일" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "없음" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "셸 스크립트 파일" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML 문서" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "CSS 스타일시트" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL 덤프 파일" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff 파일" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "환경설정 파일" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext 번역 파일" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s 스크립트 파일" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStructuredText 파일" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "프로그래밍 언어(_P)" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "스크립트 언어(_S)" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Markup 언어(_M)" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "기타 언어(_i)" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "모든 소스" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "모든 파일" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "%s 파일형식에 맞지 않는 정규표현식: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "무제" @@ -1007,8 +1013,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "보이지 않는" @@ -1016,7 +1022,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "선택한 파일 열기(_i)" @@ -1036,11 +1042,11 @@ msgid "Page Set_up" msgstr "페이지 설정(_u)" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "다른 문서 닫기(_h)" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "모두 닫기(_l)" @@ -1048,84 +1054,80 @@ msgid "_Edit" msgstr "편집(_E)" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "모두 선택(_A)" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "형식(_F)" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "선택한 부분 활자케이스전환(_o)" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "주석만들기(_C)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "주석 해제(_n)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "한줄 주석 전환(_T)" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "복제(_p)" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "들여쓰기 증가(_I)" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "들여쓰기 감소(_D)" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "선택한 부분 보내기(_S)" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "선택한 부분 보내기(_S)" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "주석 삽입(_n)" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "변경기록 항목 삽입(_C)" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "파일 헤더 삽입(_H)" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "함수 설명 삽입(_F)" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "다수행 주석 삽입(_M)" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "GPL 공지 삽입(_G)" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "BSD 사용권 공지 삽입(_B)" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "날짜 삽입(_e)" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" 템플릿 삽입(_I)" @@ -1150,7 +1152,7 @@ msgid "Find in F_iles" msgstr "파일 안에서 찾기(_i)" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "바꾸기(_R)" @@ -1170,7 +1172,7 @@ msgid "Pr_evious Message" msgstr "이전 메시지(_e)" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "이동(_G)" @@ -1198,7 +1200,7 @@ msgid "Show Side_bar" msgstr "가장자리창 보기(_b)" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "편집기" @@ -1245,15 +1247,15 @@ msgid "In_dent Type" msgstr "들여쓰기 형식(_d)" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "탭(_t)" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "스페이스(_S)" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "탭과 스페이스(_a)" @@ -1374,7 +1376,7 @@ msgid "_Debug Messages" msgstr "디버그 메시지(_D)" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "심볼" @@ -1398,72 +1400,78 @@ msgid "Scribble" msgstr "낙서" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "아이콘옆에 텍스트(_a)" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "아이콘만(_I)" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "텍스트만(_T)" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "큰 아이콘(_L)" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "작은 아이콘(_S)" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "작은 아이콘(_S)" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" msgstr "도구모음 감추기(_H)" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "도구모음 감추기(_H)" + +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "사용법 찾기(_U)" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "문서 사용법 찾기(_D)" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Tag 정의로 이동(_T)" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Tag 선언으로 이동(_a)" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "컨텍스트 행동(_x)" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "기본 설정" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "지난 세션에 사용한 파일 불러오기" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "시작할 때 지난 세션에 사용한 파일을 열기" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "가상 터미날 지원" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1472,40 +1480,40 @@ "시작할 때 VTE(가상 터미널 에뮬레이터)를 지원할지 여부.필요 없으면 비활성화 하" "십시오." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "플러그인 지원 활성화 하기" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "시작" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "창 위치와 크기를 저장" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "창의 위치와 크기를 저장하고 시작할 때 복원하기" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "끝낼때 확인하기" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "끝낼때 확인 대화상자 보이기." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "끄기" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "시작 경로:" -#: ../src/interface.c:2758 +#: ../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." @@ -1513,51 +1521,51 @@ "파일 열기와 저장의 시작 경로.\n" "절대경로로 입력해야함. 지정하지 않으면 현재작업폴더를 사용함." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "프로젝트 파일:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "프로젝트 열기의 시작 경로" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 #, fuzzy msgid "Extra plugin path:" msgstr "플러그인 지원 활성화 하기" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "경로" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 #, fuzzy msgid "Startup" msgstr "상태" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "오류 발생시, 컴파일 끝낼 때 삑 소리를 냄" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "오류가 발생하거나 컴파일이 끝날때 삑 소리를 낼지 여부." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "새 메시지 발생시 메시지창으로 포커스 전환" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1566,11 +1574,11 @@ "새로운 상태 메시지가 발생하면 아래쪽 메시지창의 메시지 탭으로 포커스 전환하" "기." -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "status bar의 상태 메시지 감추기" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1578,11 +1586,12 @@ "status bar의 모든 메시지를 지우기.\n" "모든 메시지를 상태 메시지창에 표시함." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "자동 포커스 위젯 (마우스위치에 포커스 맞추기)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1591,15 +1600,15 @@ "마우스 커서 아래의 위젯에 자동으로 포커스을 줌.\n" "편집창, 낙서탭, 찾기와 이동 도구모음, VTE에 작동함." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "기타" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "항상 찾기 반복하고 찾기 대화상자 감추기" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1608,11 +1617,11 @@ "항상 문서전체에서 찾기를 반복하고 찾기/이전찾기를 클릭한후 찾기대화상자를 감" "추기." -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "찾기 대화상자에 커서아래의 단어 사용하기" -#: ../src/interface.c:2896 +#: ../src/interface.c:2916 #, fuzzy msgid "" "Use current word under the cursor when opening the Find, Find in Files or " @@ -1621,30 +1630,30 @@ "찾기, 파일에서 찾기, 바꾸기 대화상자를 열 때 현재 커서아래의 단어를 선택되지 " "않은 상태로 사용함." -#: ../src/interface.c:2898 +#: ../src/interface.c:2918 msgid "Use the current file's directory for Find in Files" msgstr "파일에서 찾을 때 현재파일이 들어있는 폴더를 사용함" -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "찾기" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "프로젝트 기반 세션 파일 사용" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "프로젝트 세션 파일을 저장하고 프로젝트를 다시 열 때 복원 여부." -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "프로젝트 기반 폴더 안에 프로젝트 파일 저장하기" -#: ../src/interface.c:2929 +#: ../src/interface.c:2949 #, fuzzy msgid "" "When enabled, a project file is stored by default inside the project base " @@ -1657,76 +1666,76 @@ "\n" "프로젝트 파일의 경로는 \"새 프로젝트 대화상자\"에서 바꿀 수 있음." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "프로젝트" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 #, fuzzy msgid "Miscellaneous" msgstr "기타" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "일반" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "심볼 목록 보기" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "심볼 목록 보기전환" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "문서 목록 보기" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "문서 목록 보기 전환" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "가장자리창" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "심볼 목록:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "메시지창:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "편집창:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "메시지창 글꼴 설정" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "심볼 목록 글꼴 설정" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "편집창 글꼴 설정" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "글꼴" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "편집창 탭보기" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "닫기 단추 보기" -#: ../src/interface.c:3064 +#: ../src/interface.c:3084 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1735,120 +1744,125 @@ "파일을 쉽게 닫을 수 있게 파일탭에 작은 X자 단추를 보여줌.\n" "(지니를 다시 시작해야 함)" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "새 파일탭 위치:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "왼쪽" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "파일탭을 메시지창 왼쪽에 놓기" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "오른쪽" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "파일탭을 메시지창 오른쪽에 놓기" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "모든 부가적인 위젯 보기 전환" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "모든 부가적인 위젯 보기 전환" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "편지창 탭" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "위" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "아래" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "가장자리창:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "탭 위치" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "status bar 보기" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "프로그램창 아래쪽의 status bar 보기 여부." -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "인터페이스" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "도구모음 보기" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "도구모음" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "아이콘 양식:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "아이콘 크기:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "모양새" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "도구모음 보기(_T)" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "도구모음" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "줄바꾸기" -#: ../src/interface.c:3349 +#: ../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 "자동으로 줄바꾸기. 주의:느린 시스템에서는 사용 지양." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "\"똑똑한\" home키 활성" -#: ../src/interface.c:3354 +#: ../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 " @@ -1862,11 +1876,11 @@ "활성화하지 않으면 현재 위치에 상관없이 언제나 캐럿을 행의 맨처음으로 이동시킵" "니다." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "드래그 앤 드롭 비활성" -#: ../src/interface.c:3359 +#: ../src/interface.c:3403 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1875,19 +1889,19 @@ "드래그 앤 드롭을 비활성화하면 편집창의 내/외부 어디에서도 선택한 부분을 드래" "그 앤 드롭 할 수 없습니다." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "접기 활성" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "코드 접기 활성 여부" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "접기 지점의 모든 자식 접기/펼치기" -#: ../src/interface.c:3369 +#: ../src/interface.c:3413 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1896,35 +1910,35 @@ "접기 지점의 모든 자식을 접거나 펼칩니다. 접기 심볼을 클릭할 때 Shift 키를 누" "르면반대의 행동을 합니다." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "컴파일 오류 표시에 지표 사용" -#: ../src/interface.c:3374 +#: ../src/interface.c:3418 #, 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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "새로운 줄에 질질끌리는 공백 지우기" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "새로운 줄에 이전 줄에서부터 질질끌리는 공백 지우기 활성." -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "행 분리 열:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "표지 전환 주석:" -#: ../src/interface.c:3406 +#: ../src/interface.c:3450 #, fuzzy msgid "" "A string which is added when toggling a line comment in a source file, it is " @@ -1932,113 +1946,114 @@ msgstr "" "소스파일 내의 한줄 주석을 전환할 때 추가된 문자열.주석이 전환되었음을 표시함." -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "기능" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "기능" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "자동들여쓰기 모드:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "기본" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "현재 문자" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "괄호 일치" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "형식:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "너비:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "한단계 들여쓰기의 문자 너비" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "들여쓰기에 스페이스 사용" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "들여쓰기에 탭 사용" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "들여쓰기가 탭 너비보다 작으면 스페이스 사용, 그렇지 않으면 둘 다 사용" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "하드 탭 너비:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "파일 열기시 파일 내용으로 들여쓰기 추정 여부." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "탭 키 들여쓰기" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 #, fuzzy msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "탭 문자 입력 대신 탭키 및 shift-탭키로 들여쓰기 및 들여쓰기해제." -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "들여쓰기" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 #, fuzzy msgid "Indentation" msgstr "들여쓰기" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "토막 완성" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 #, fuzzy msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "정의된 짧은 문자열을 입력하면 복잡한 문자열로 완성함." -#: ../src/interface.c:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "XML tag 자동 완성" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "XML태그(HTML태그 포함)를 자동완성하고 닫아줌." -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "여러줄 주석 자동 잇기" -#: ../src/interface.c:3591 +#: ../src/interface.c:3635 #, fuzzy msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " @@ -2047,187 +2062,196 @@ "C, C++, Java등의 소스파일에서 여러줄 주석내에 새줄을 입력할 때 자동으로그 줄" "도 기존의 주석으로 이어줌." -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "자동 심볼 완성" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "열린 파일내의 함수명, 전역변수등등의 알려진 심볼을 자동으로 완성함." -#: ../src/interface.c:3604 +#: ../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 "최대 심볼 이름 제안 횟수:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "자동완성 목록 높이:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "자동완성 필요문자 수:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 #, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "심볼 자동완성 목록을 나타내기 위해 필요한 문자의 수." -#: ../src/interface.c:3640 +#: ../src/interface.c:3692 #, fuzzy -msgid "Display height in rows for the auto completion list" +msgid "Display height in rows for the autocompletion list" msgstr "자동완성 목록 줄 높이." -#: ../src/interface.c:3649 +#: ../src/interface.c:3701 #, fuzzy -msgid "Maximum number of entries to display in the auto completion list" +msgid "Maximum number of entries to display in the autocompletion list" msgstr "자동완성 목록 최대 표시 수." -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "자동완성" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "자동완성" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "구문강조 색상 반전" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "들여쓰기 보조선 보기" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "들여쓰기 보조용 작은 점선 보기." -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "공백 표시 보기" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "스페이스 대신 점, 탭 대신 화살표를 표시함." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "줄끝 표시 보기" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "줄끝 표시 보여줌." -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 #, fuzzy msgid "Show line numbers" msgstr "줄번호 보기(_L)" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "줄번호 여백 보기 전환." -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 #, fuzzy msgid "Show markers margin" msgstr "표지 여백 보기(_M)" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "줄번호 우측의 줄 표지 여백 보기 전환." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "마지막 줄에서 스크롤 멈추기" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 #, fuzzy msgid "Whether to stop scrolling one page past the last line of a document" msgstr "문서의 마지막 줄에서 스크롤을 멈출지 여부." -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "표시" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "긴줄 표지:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "긴줄 표지 색상:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "긴줄 표지 색상 설정" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "색상 선택기" -#: ../src/interface.c:3826 +#: ../src/interface.c:3878 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2237,22 +2261,22 @@ "긴줄 표지는 편집창내의 긴줄을 표사해주거나 행분리 힌트를 주는 얇은 세로선입니" "다. 0보다 큰 수를 지정하여 어느 열에 긴줄 표지를 나타낼지 설정하십시오." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "선" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "편집창내의 설정된 열에 세로선을 표시함." -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "배경색" -#: ../src/interface.c:3846 +#: ../src/interface.c:3898 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2262,58 +2286,58 @@ "설정된 열 이후의 문자 배경을 아래의 색상으로 바꿈.\n" "(가변폭 글꼴 사용시 권함)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "사용안함" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "긴줄 표지" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "표시" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "명령행에서 새 문서 열기" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 #, fuzzy msgid "Start a new file for each command-line filename that doesn't exist" msgstr "각 명령행 파일 이름으로 새로운 문서 시작." -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "줄끝 표시문자 기본값:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "새 파일" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 #, fuzzy msgid "Sets the default encoding for newly created files" msgstr "새로 생성된 파일 인코딩 기본값 설정." -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "인코딩 기본값 (새 파일):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "인코딩 기본값 (기존 파일):" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "기존 파일 열 때 인코딩 기본값 설정." -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "파일 열 때 고정된 인코딩 사용." -#: ../src/interface.c:3978 +#: ../src/interface.c:4030 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " @@ -2323,53 +2347,53 @@ "파일 열 때 인코딩 자동 추정을 비활성화하고 지정한 인코딩으로 파일을 업니다.\n" "(보통의 경우 필요없음)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "인코딩" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "파일 끝 개행표시 조치" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 msgid "Ensures that at the end of the file is a new line" msgstr "파일 끝의 개행표시를 조치합니다." -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "질질 끌리는 스페이스와 탭 지우기" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "질질 끌리는 스페이스, 탭, 줄끝표시 지우기" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "탭을 스페이스로 바꾸기" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "문서내의 모든 탭을 스페이스로 바꿈." -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "파일 저장" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "최근 파일목록 길이:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "최근 파일목록에 저장할 갯수 지정." -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "디스크 검사 간격:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2377,50 +2401,50 @@ "디스크의 문서파일 변경 검사 간격을 \"초\"단위로 지정.\n" "0으로 지정하면 검사하지 않음." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "파일" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "make 프로그램:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "터미널 프로그램:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "웹브라우저:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "make 도구의 경로와 옵션" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" msgstr "" "-e 인수를 지정할 수 있는 xterm, gnome-terminal, konsole등의 터미널 에뮬레이터" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "선호하는 브라우저의 경로와 가능한 추가적인 인수" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "grep 프로그램:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "도구 경로" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "컨텍스트 행동:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2430,67 +2454,67 @@ "현재 선택한 단어를 인수로 지정한 명령을 실행합니다.\n" "예) \"geany %s\"은(는) 선택한 단어와 같은 이름의 파일을 geany로 편집합니다. " -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "명령" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "도구" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "개발자의 이메일 주소" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "개발자의 이니셜" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "최초 버전:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "새 파일의 최초 버전 번호" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "회사명" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "개발자:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "회사명:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "이메일 주소:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "이니셜:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "개발자 이름" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "년도:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "일자:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "일시:" -#: ../src/interface.c:4382 +#: ../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." @@ -2498,7 +2522,7 @@ "{날짜시간} 형식지정.\n" "ANSI C의 strftime 함수의 모든 식별기호 사용가능." -#: ../src/interface.c:4389 +#: ../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." @@ -2506,7 +2530,7 @@ "{년도} 형식지정.\n" "ANSI C의 strftime 함수의 모든 식별기호 사용가능." -#: ../src/interface.c:4396 +#: ../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." @@ -2514,63 +2538,63 @@ "{날짜} 형식지정.\n" "ANSI C의 strftime 함수의 모든 식별기호 사용가능." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "템플릿 데이터" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "템플릿" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "바꾸기(_h)" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "바로 가기" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "바로 가기" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "명령:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "인쇄 명령의 경로(인수 %f은(는) 파일 이름)." -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "외부명령으로 인쇄하기" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "줄 번호 인쇄" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 #, fuzzy msgid "Add line numbers to the printed page" msgstr "줄 번호를 추가해서 인쇄하기." -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "쪽 번호 인쇄" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "각 쪽의 하단에 쪽 번호를 인쇄함. 2줄을 사용함." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "머리말 인쇄" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../src/interface.c:4575 ../src/printing.c:392 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2579,20 +2603,20 @@ "각쪽의 상단에 쪽 번호, 파일 이름, 현재날짜를 포함하는 작은 머리말을 인쇄함(아" "래 참조).3줄을 사용함." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "기본이름만 사용" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "경로명이 없는 기본이름만 인쇄." -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "날짜 형식:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2601,537 +2625,556 @@ "각쪽의 머리말에 추가된 날짜와 인쇄시간 형식을 지정함.\n" "ANSI C의 strftime 함수의 모든 식별자를 사용할 수 있음." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "GTK 고유 인쇄 사용" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "인쇄" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "프로젝트 속성" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "파일" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "새로 만들기" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "열기" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "선택한 파일 열기" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "저장" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "다른 이름으로 저장" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "모두 저장" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "인쇄" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "닫기" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "모두 닫기" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "다시 불러오기" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "프로젝트" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "프로젝트 속성" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "실행취소" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "재실행" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "줄 및 선택한 부분 복제" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "현재 줄(들) 지우기" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "현재 줄(들) 지우기" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "현재 줄 자리바꾸기" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "현재 줄로 스크롤" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "한줄 위로 스크롤" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "한줄 아래로 스크롤" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "토막 완성" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "토막 완성 감춤" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "컨텍스트 행동" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "단어 완성" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "calltip 보기" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "매크로 목록 보기" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "클립보드" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "잘라내기" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "복사" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "붙여 넣기" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "현재 줄(들) 복사" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "현재 줄(들) 잘라내기" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "선택" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "모두 선택" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "현재 단어 선택" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "현재 줄(들) 선택" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "현재 문단 선택" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "형식" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "선택한 부분 활자 케이스 전환" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "한줄 주석 전환" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "줄(들) 주석" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "줄(들) 주석 해제" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "들여쓰기 증가" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "들여쓰기 감소" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "공백 하나만큼 들여쓰기 증가" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "공백 하나만큼 들여쓰기 감소" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "똑똑한 한줄 주석" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "맞춤 명령 1로 보냄" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "맞춤 명령 2로 보냄" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "맞춤 명령 3으로 보냄" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "선택한 부분 보내기(_S)" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "삽입" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "날짜 삽입" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "대안 공백 삽입" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "환경 설정" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "찾기" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "찾기" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "다음 찾기" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "이전 찾기" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "선택부분 다음 찾기" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "다선택부분 이전 찾기" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "바꾸기" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "파일 안에서 찾기" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "다음 메시지" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "이전 메시지" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "사용법 찾기" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "문서 사용법 찾기" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Make All(_M)" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "이동" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "뒤로" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "앞으로" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "일치하는 괄호로 이동" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "표지 보기 전환" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "다음 표지로 이동" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "이전 표지로 이동" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "태그 정의로 이동" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "태그 선언으로 이동" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "줄 처음으로 이동" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "줄 끝으로 이동" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "줄 끝으로 이동" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "이전 단어부분으로 이동" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "다음 단어부분으로 이동" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "보기" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "모든 부가적인 위젯 보기 전환" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "전체 화면" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "메시지창 보기 전환" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "가장자리창 보기 전환" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "확대" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "축소" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "포커스" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "편집창으로 포커스 전환" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "낙서창으로 포커스 전환" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "VTE로 포커스 전환" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "찾기 막대로 포커스 전환" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "가장자리창으로 포커스 전환" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "컴파일러창으로 포커스 전환" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "노트북 탭" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "왼쪽 문서로 포커스 전환" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "오른쪽 문서로 포커스 전환" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "최근에 사용한 문서로 포커스 전환" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "문서를 왼쪽으로 이동" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "문서를 오른쪽으로 이동" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "문서를 처음으로 이동" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "문서를 끝으로 이동" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "문서" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "자동 줄바꿈 전환" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "자동 행분리 전환" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "스페이스를 탭으로 바꿈" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "현재 접기 전환" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "모두 접기" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "모두 펼치기" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "심볼 목록 다시 불러오기" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "제작" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "컴파일" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Make 맞춤타겟" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make 오브젝트" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "다음 오류" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "이전 오류" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "실행" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "실행 (대안 명령)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "제작 옵션" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "색상 선택기 보기" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "도움말" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "바로 가기" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "다음 바로 가기는 변경 가능:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 #, fuzzy msgid "Switch to Document" msgstr "왼쪽 문서로 포커스 전환" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "메모 및 낙서로 사용할 문자열을 입력하십시오." -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "하나 또는 그 이상의 세션 파일 불러오기 실패함." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "디버그 메시지" @@ -3186,7 +3229,7 @@ msgstr "지니 설치 폴더 prefix 출력" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "이진 세션 파일을 불러오지 않기" #: ../src/main.c:143 @@ -3201,24 +3244,24 @@ msgid "Show version and exit" msgstr "버전 출력" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[파일들...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3227,14 +3270,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3245,22 +3288,22 @@ "환경설정 폴더없이 지니를 실행하면 문제가 생길 수 있습니다.\n" "무시하고 지니를 시작할까요?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "'%s' 파일을 찾을 수 없습니다." -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "지니 %s 입니다." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "환경설정 폴더를 만들 수 없습니다 (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "환경설정 파일 다시 불러옴." @@ -3276,7 +3319,7 @@ msgid "_Hide Message Window" msgstr "메시지창 감추기(_H)" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3285,11 +3328,11 @@ "\"%s\" 플러그인은 지니와 바이너리 호환성이 없습니다.\n" "다시 컴파일해서 사용하십시오." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "플러그인 관리(_P)" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3300,23 +3343,23 @@ "설명: %s\n" "저자: %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "활성" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "플러그인" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "사용할 수 있는 플러그인이 없습니다." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "플러그인" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3324,48 +3367,58 @@ "아래는 사용가능한 플러그인 목록입니다.\n" "지니가 시작할 때 불러올 플러그인들을 선택하십시오." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "플러그인 상술:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "행동" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "바로 가기" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "키 가로채기" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "\"%s\"에 할당하고싶은 키 조합을 누르십시오." -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +#, fuzzy +msgid "_Expand All" +msgstr "모두 찾기(_F)" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +#, fuzzy +msgid "_Collapse All" +msgstr "모두 닫기(_l)" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "행동" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "바로 가기" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "변경(_O)" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "단축키를 변경하시겠습니까?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "'%s'은(는) 이미 \"%s\"에 할당되어 있습니다." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "도구 경로 입력." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3373,7 +3426,7 @@ "템플릿에 사용할 정보 설정.\n" "자세한 내용은 도움 문서 참고." -#: ../src/prefs.c:1458 +#: ../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." @@ -3383,7 +3436,7 @@ "\"도구->환경설정\" 다시불러오기를 실행해야 합니다." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3394,7 +3447,7 @@ "직접 단축키표현을 입력합니다." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3402,60 +3455,61 @@ "주의: GTK 고유 인쇄는 GTK 버전 2.10 이상을 사용하여 제작하고, GTK 버전" "2.10 이상의 환경에서 지니를 실행해야 가능합니다." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -#: ../src/printing.c:270 +#: ../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 "%2$d쪽 중 %1$d쪽" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "문서 설정" -#: ../src/printing.c:375 +#: ../src/printing.c:410 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "경로명이 없는 기본이름만 인쇄." -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, fuzzy, c-format msgid "Page %d of %d" msgstr "%2$d쪽 중 %1$d쪽" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "%s 파일 인쇄 취소함." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "%s 파일 인쇄함." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "%s 파일 인쇄 실패 (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "먼저 속성 대화상자에서 인쇄 명령을 지정하십시오." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3466,7 +3520,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "\"%s\" 파일 인쇄 실패 (반환 코드: %s)." @@ -3485,19 +3539,19 @@ msgid "C_reate" msgstr "만들기(_r)" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "이름:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "파일 이름:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "기반 경로:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3506,41 +3560,41 @@ "프로젝트를 구성하는 모든 파일들의 기반 폴더. 새로 만들거나, 기존 폴더를 사용" "할 수 있습니다. 프로젝트 파일 이름에 상대경로를 사용할 수 있게합니다." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "프로젝트 기반 경로 선택" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "\"%s\" 프로젝트 파일을 불러올 수 없습니다." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "프로젝트 열기" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "프로젝트 파일" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "\"%s\" 프로젝트 닫음." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "설명:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "기반 경로내에서 Make" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "실행 명령:" -#: ../src/project.c:457 +#: ../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." @@ -3548,81 +3602,81 @@ "프로젝트 기반 폴더내에서 실행할 명령. 옵션 추가 가능함. 비워두면 디폴트 명령" "을 실행함." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "파일 패턴:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "계속하기 전에 닫을까요?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "'%s' 프로젝트는 이미 열렸습니다." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "지정된 프로젝트명이 너무 짧습니다." -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "지정된 프로젝트명이 너무 깁니다. (최대 글자수: %d)" -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "올바르지 않은 프로젝트 파일 이름을 지정했습니다." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "프로젝트 기반 경로 폴더를 만들까요?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "\"%s\" 경로는 존재하지 않습니다." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "프로젝트 기반 폴더를 만들 수 없습니다 (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "프로젝트 파일을 쓸 수 업습니다 (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "\"%s\" 프로젝트 만듬." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "\"%s\" 프로젝트 저장함." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "프로젝트 파일 이름 선택" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "프로젝트 실행 명령 선택" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "\"%s\" 프로젝트 열음." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "정규 표현식 사용(_U)" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3630,15 +3684,15 @@ "POSIX 호환 정규 표현식을 사용합니다. 정규표현식 사용에 관한 자세한 정보는 도" "움말 문서를 읽어보십시오." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "뒤로 찾기(_b)" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "예외처리문자 사용(_e)" -#: ../src/search.c:231 +#: ../src/search.c:246 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3647,400 +3701,410 @@ "\\\\, \\uXXXX(유니코드 문자), \\t, \\n, \\r 등을 상응하는 제어문자로 바꿉니" "다." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "대소문자 구분(_a)" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "단어 전체 일치(_w)" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "단어 시작부분 일치(_t)" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "이전(_P)" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "다음(_N)" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "찾기(_S):" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "모두 찾기(_F)" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "표시(_M)" -#: ../src/search.c:418 +#: ../src/search.c:433 #, fuzzy msgid "Mark all matches in the current document" msgstr "현재 문서의 모든 일치하는 부분 표시." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "세션(_o)" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "문서(_I)" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "대화상자 닫기(_d)" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "열린 대화상자를 유지하기 원하면 이 옵션을 비활성화." -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "바꾸고 찾기(_n)" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "바꿀 문자열(_h):" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "모두 바꾸기(_p)" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "선택(_l)" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "선택한 부분에서 일치하는 것 모두 바꾸기" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "폴더(_D):" -#: ../src/search.c:712 +#: ../src/search.c:727 #, fuzzy msgid "E_ncoding:" msgstr "인코딩 설정:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "문자열 고정(_t)" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "정규표현식 grep(_G)" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 #, fuzzy msgid "See grep's manual page for more information" msgstr "자세한 정보는 grep 매뉴얼 참고." -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "확장 정규표현식(_E)" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "하위 폴더 포함(_R)" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "찾기 결과 반전(_I)" -#: ../src/search.c:782 +#: ../src/search.c:797 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "일치하는 부분 반전." -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "추가 옵션(_x):" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "grep에 사용할 추가 옵션" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "%d번의 \"%s\" 일치 찾음." -#: ../src/search.c:1184 +#: ../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:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "올바르지 않은 폴더." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "문자열 찾을 수 없음." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "grep 도구 '%s' 실행 실패; 기본 설정에서 경로설정을 점검하십시오." -#: ../src/search.c:1400 +#: ../src/search.c:1419 #, fuzzy msgid "Searching..." msgstr "찾기" -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (폴더: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "%s 폴더를 열 수 없습니다." -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "" -#: ../src/search.c:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "일치 없음." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../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:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 #, fuzzy msgid "Structures" msgstr "상태" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 #, fuzzy msgid "ID Selectors" msgstr "선택(_l)" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 #, fuzzy msgid "Type Selectors" msgstr "선택" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "속성" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "내보내기" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 #, fuzzy msgid "Structs" msgstr "상태" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "\"%s\" : 알 수 없는 파일확장자.\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "태그 파일 만들기 실패했습니다. 태그가 없는 것 같습니다.\n" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4049,7 +4113,7 @@ "사용법: %s -g <태그파일> <파일목록>\n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4060,178 +4124,186 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "태그 불러오기" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "지니 태그 파일 (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "태그파일 %s 불러옴 '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "'%s' 태그파일 불러오기 실패." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "\"%s\" 선언을 찾을 수 없습니다." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" 정의를 찾을 수 없습니다." -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "모두 찾기(_F)" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "모두 닫기(_l)" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "이름순으로 정렬(_N)" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "형태순으로 정렬(_A)" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "현재 파일 저장" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "모두 저장(_l)" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "열린 파일 모두 저장" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "현재 파일을 디스크로부터 다시 불러오기" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "현재 파일 닫기" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 #, fuzzy msgid "Close all open files" msgstr "열린 파일 모두 닫기" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 #, fuzzy msgid "Cut the current selection" msgstr "선택한 부분 형식변환" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 #, fuzzy msgid "Copy the current selection" msgstr "현재 파일 컴파일" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 #, fuzzy msgid "Delete the current selection" msgstr "선택한 부분 형식변환" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "최근 수정사항 취소" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "최근 수정사항 다시실행" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "현재 파일 컴파일" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "현재 파일 실행 또는 보기" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "팔레트에서 색상을 고를 수 있도록 색상선택기 실행." -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "글꼴 확대" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "글꼴 축소" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "들여쓰기 감소" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "들여쓰기 증가" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "입력한 문자열을 현재파일에서 찾기" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 #, fuzzy msgid "Jump to the entered line number" msgstr "입력한 줄번호로 이동." -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "지니 끝내기" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "XML 문서" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "현재 문서의 모든 일치하는 부분 표시." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "새 파일 만들기" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "기존 파일 열기" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 #, fuzzy 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 "표시" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4299,125 +4371,147 @@ msgid "Characters:" msgstr "문자열:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "태그 없음" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "심볼 목록 보기(_y)" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "문서 목록 보기(_D)" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "가장자리창 감추기(_i)" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "전체 경로명 보기(_F)" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "행: %d\t 열: %d\t 선택: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "읽기전용" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "수정" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "삽입" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "탭" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "스페이스" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "탭/스페이스" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "개행: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "인코딩: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "파일형식: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "수정됨" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "유효범위: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "글꼴 바꿈 (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C 표준 라이브러리" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99 표준" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C 표준 라이브러리)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ 표준 라이브러리" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "맞춤 날짜 형식 설정(_S)" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "폴더 선택" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "파일 선택" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 #, fuzzy msgid "C_onfiguration Files" msgstr "환경설정 파일 다시 불러옴." -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +#, fuzzy +msgid "Save All" +msgstr "모두 저장(_l)" + +#: ../src/ui_utils.c:1786 #, fuzzy msgid "Close All" msgstr "모두 닫기(_l)" +#: ../src/utils.c:324 +msgid "Win (CRLF)" +msgstr "윈도우 (CRLF)" + +#: ../src/utils.c:325 +msgid "Mac (CR)" +msgstr "매킨토시 (CR)" + +#: ../src/utils.c:326 +msgid "Unix (LF)" +msgstr "유닉스 (LF)" + #: ../src/vte.c:301 ../src/vte.c:726 msgid "Terminal" msgstr "터미널" @@ -4588,161 +4682,145 @@ "새로운 터미널창을 열지 않고 VTE내에서 프로그램 실행하기.\n" "주의: VTE안에서 실행한 프로그램은 멀출 수 없습니다." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "지니 프로젝트 파일" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "실행가능" -#: ../src/win32.c:575 -msgid "Error" -msgstr "오류" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "질문" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "경고" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "정보" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "클래스 빌더" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "새로운 클래스를 만들기 위한 소스파일 만들기." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "클래스 만들기" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "클래스" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "클래스명:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "헤더 파일:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "소스 파일:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "상속" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "기본 클래스:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "기본 헤더:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "전역" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "기본 GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "옵션" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "생성자 만들기" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "소멸자 만들기" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+ 생성자 타입" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "클래스 만들기(_s)" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "C++ 클래스(_C)" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "GTK+ 클래스(_G)" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML 문자" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "'&' 같은 HTML 문자요소를 삽입." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML 문자" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 문자" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "그리스어 문자" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "수학 문자" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "기술 문자" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "화살표" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "기능 문자" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "기타 문자" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "특수문자" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "삽입(_I)" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4750,160 +4828,160 @@ "아래 목록에서 커서위치의 특수문자를 더블클릭하거나 삽입 단추를 클릭하여 특수 " "문자를 입력합니다." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "문자" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (이름)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "특수 HTML 문자 삽입(_I)" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "바꾸기" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 #, fuzzy msgid "Bulk replacement of special chars" msgstr "새 파일탭 위치:" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "특수 HTML 문자 삽입" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "특수문자" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 #, fuzzy msgid "Toggle plugin status" msgstr "한줄 주석 전환" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "내보내기" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "현재 문서를 다른 형식으로 내보내기." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "파일 내보내기" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "현재 확대수준 사용(_U)" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 #, fuzzy msgid "" "Renders the font size of the document together with the current zoom level" msgstr "현재 확대 수준에 맞게 문서의 글꼴 크기를 표현함." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "문서를 '%s' 형식으로 내보내기 성공." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "'%s' 파일에 쓸 수 없음 (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "기존의 '%s'파일이 있습니다. 바꾸시겠습니까?" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "내보내기(_E)" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "HTML 형식으로(_H)" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "LaTeX 형식으로(_L)" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "파일 탐색기" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "가장자리창에 파일 탐색기탭을 추가하기." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "너무 많은 항목을 선택했습니다!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "맞춤 외부 명령 '%s' 실행 실패 (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "외부 파일 탐색기 열기(_e)" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "파일에서 찾기(_F)" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "숨김파일 보기(_H)" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "위로" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "새로 고침" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "내 폴더" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "현재문서 위치로 경로 이동" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "필터 지우기" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "필터:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "파일목록에 포커스 주기" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "경로입력필드에 포커스 주기" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "플러그인 환경설정 폴더를 만들 수 없습니다." @@ -4942,7 +5020,7 @@ #: ../plugins/filebrowser.c:1128 #, fuzzy -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "프로젝트 기반 경로 폴더를 만들까요?" #: ../plugins/filebrowser.c:1132 @@ -4951,136 +5029,153 @@ "Change the directory to the base directory of the currently opened project" msgstr "현재 파일 폴더로 부터 diff 만들기" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "저장 행동" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "이 플러그인은 파일 저장에 관한 여러가지 다른 행동들을 제공합니다." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "복사본 백업: 폴더를 만들 수 없습니다 (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "복사본 백업: 파일을 읽을 수 없습니다 (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "복사본 백업: 파일을 저장할 수 없습니다 (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." msgstr[0] "자동저장: %d개 파일을 자동저장 했습니다." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "폴더 선택" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "백업 폴더가 존재하지 않거나 쓰기권한이 없습니다." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "자동저장" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "활성(_E)" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "자동저장 간격(_i):" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "초" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "자동저장 상태 메시지 출력(_P)" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "현재 열린 파일만 저장(_f)" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "모든 열린 파일 저장(_v)" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "즉석 저장" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "새로 열린 파일에 사용할 파일형식(_F):" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "복사본 백업" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "백업 파일 저장 폴더(_D):" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "백업파일 날짜/시간 형식(_T) (\"man strftime\"):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "백업 목적지의 폴더 단계(_l):" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "창 나누기" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "편집창을 두개로 나눔." -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "현재 문서의 모든 일치하는 부분 표시." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "창 나누지 않기(_U)" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "창 나누기(_S)" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "수평(_H)" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 #, fuzzy msgid "Split Horizontally" msgstr "수평(_H)" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 #, fuzzy msgid "Unsplit" msgstr "창 나누지 않기(_U)" +#~ msgid "Diff file" +#~ msgstr "Diff 파일" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText 파일" + +#~ msgid "Select _All" +#~ msgstr "모두 선택(_A)" + +#~ msgid "Automatic symbol completion" +#~ msgstr "자동 심볼 완성" + #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "%s 보기 실패: 이미 컴파일되지 않았는지 확인요망" @@ -5324,9 +5419,6 @@ #~ msgid "Couldn't find pixmap file: %s" #~ msgstr "%s pixmap 파일을 찾을 수 없습니다." -#~ msgid "Show _Full Path Name" -#~ msgstr "전체 경로명 보기(_F)" - #~ msgid "Terminal emulation:" #~ msgstr "터미널 에뮬레이션:" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/lb.po /tmp/ssBwSf4GIv/geany-0.18/po/lb.po --- geany-0.17/po/lb.po 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/po/lb.po 2009-08-16 17:18:28.000000000 +0100 @@ -0,0 +1,5219 @@ +# Letzebuergesch translations for PACKAGE package. +# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the geany package. +# Laurent Hoeltgen , 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-05-31 13:56+0100\n" +"Last-Translator: Laurent HOELTGEN \n" +"Language-Team: Letzebuergesch\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Letzeburgesch\n" +"X-Poedit-Country: LUXEMBOURG\n" + +#: ../geany.desktop.in.h:1 +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 +msgid "Geany" +msgstr "Geany" + +#: ../geany.desktop.in.h:3 +msgid "Integrated Development Environment" +msgstr "Integréiert Entwécklungsumgebung" + +#: ../src/about.c:139 +msgid "About Geany" +msgstr "Iwwert Geany" + +#: ../src/about.c:189 +msgid "A fast and lightweight IDE" +msgstr "En klenge an schnelle IDE" + +#: ../src/about.c:210 +#, 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 +msgid "Info" +msgstr "Info" + +#: ../src/about.c:257 +msgid "Developers" +msgstr "Entwéckler" + +#: ../src/about.c:266 +msgid "maintainer" +msgstr "Haaptentwéckler" + +#: ../src/about.c:274 +msgid "developer" +msgstr "Entwéckler" + +#: ../src/about.c:282 +msgid "translation maintainer" +msgstr "Iwwersetzungskoordinator" + +#: ../src/about.c:291 +msgid "Translators" +msgstr "Iwwersetzer" + +#: ../src/about.c:311 +msgid "Previous Translators" +msgstr "Vireg Iwwersetzer" + +#: ../src/about.c:332 +msgid "Contributors" +msgstr "Kollaborateuren" + +#: ../src/about.c:342 +#, c-format +msgid "" +"Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "" +"E puer Kollaborateuren (fir eng méi detailléiert Lescht, kuckt an den " +"Fichier %s):" + +#: ../src/about.c:368 +msgid "Credits" +msgstr "Credits" + +#: ../src/about.c:382 +msgid "License" +msgstr "Lizenz" + +#: ../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 "" +"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 +#, 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:236 ../src/build.c:650 +#, 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:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 +#, 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 +#, c-format +msgid "Failed to change the working directory to \"%s\"" +msgstr "Konnt d'Aarbechtsverzeechnis net an \"%s\" änneren" + +#: ../src/build.c:707 +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 +msgid "Compilation failed." +msgstr "Compiléieren feelgeschloen." + +#: ../src/build.c:928 +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" + +#. 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 +msgid "_Next Error" +msgstr "_Nächsten Feeler" + +#: ../src/build.c:1097 ../src/build.c:1194 +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" + +#. arguments +#: ../src/build.c:1231 +msgid "_Set Arguments" +msgstr "Parameter vum Programm _uginn" + +#: ../src/build.c:1306 +msgid "Set Arguments" +msgstr "Parameter vum Programm uginn" + +#: ../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:1324 +msgid "DVI creation:" +msgstr "DVI erstellen" + +#: ../src/build.c:1344 +msgid "PDF creation:" +msgstr "PDF erstellen" + +#: ../src/build.c:1364 +msgid "DVI preview:" +msgstr "DVI Virschau" + +#: ../src/build.c:1384 +msgid "PDF preview:" +msgstr "PDF Virschau" + +#: ../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 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:1493 +msgid "Set the commands for building and running programs." +msgstr "D'Commanden fir Programmer ze erstellen an auszeféieren uginn" + +#. in-dialog heading for the "Set Includes and Arguments" dialog +#: ../src/build.c:1501 +#, 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:1560 ../src/dialogs.c:1223 +msgid "Execute:" +msgstr "Ausféieren" + +#: ../src/build.c:1892 ../src/toolbar.c:344 +msgid "Build the current file" +msgstr "Aktuellen Fichier erstellen" + +#: ../src/build.c:1917 +msgid "Make Custom Target" +msgstr "Make mat eegenem Ziel" + +#: ../src/build.c:1918 +msgid "" +"Enter custom options here, all entered text is passed to the make command." +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: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:1973 +msgid "Compile the current file with Make" +msgstr "Den aktuellen Fichier mat Make compiléieren" + +#: ../src/build.c:2035 +msgid "Failed to execute the view program" +msgstr "Konnt den Programm fir ze betruechten net ausféieren" + +#: ../src/build.c:2073 +#, c-format +msgid "Process could not be stopped (%s)." +msgstr "Prozess konnt net gestoppt ginn (%s)." + +#: ../src/build.c:2092 ../src/build.c:2106 +msgid "No more build errors." +msgstr "Keng weider Feelermeldungen" + +#: ../src/callbacks.c:152 +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 +msgid "_Reload" +msgstr "_Nei lueden" + +#: ../src/callbacks.c:470 +msgid "Any unsaved changes will be lost." +msgstr "All net gespäichert Ännerungen ginn verluer." + +#: ../src/callbacks.c:471 +#, 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 +msgid "Go to Line" +msgstr "Bei d'Zeil goen" + +#: ../src/callbacks.c:1249 +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 +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 +msgid "dd.mm.yyyy" +msgstr "dd.mm.yyyy" + +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +msgid "mm.dd.yyyy" +msgstr "mm.dd.yyyy" + +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +msgid "yyyy/mm/dd" +msgstr "yyyy/mm/dd" + +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +msgid "dd.mm.yyyy hh:mm:ss" +msgstr "dd.mm.yyyy hh:mm:ss" + +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +msgid "mm.dd.yyyy hh:mm:ss" +msgstr "mm.dd.yyyy hh:mm:ss" + +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +msgid "yyyy/mm/dd hh:mm:ss" +msgstr "yyyy/mm/dd hh:mm:ss" + +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +msgid "_Use Custom Date Format" +msgstr "Benotzerdefinéierten Format fir den Dat_um benotzen" + +#: ../src/callbacks.c:1497 +msgid "Custom Date Format" +msgstr "Benotzerdefinéierten Format fir den Datum" + +#: ../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 "" +"Hei kann en benotzerdefinéierten Datumsformat aginn ginn. Dobäi kënnen all " +"d'Spécificateuren benotzt ginn, déi och an der ANSI C Fonctioun strftime " +"virkommen." + +#: ../src/callbacks.c:1516 +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 +msgid "No more message items." +msgstr "Keng weider Meldungen." + +#. initialize the dialog +#: ../src/dialogs.c:140 ../src/prefs.c:1640 +msgid "Open File" +msgstr "Fichier opmaachen" + +#: ../src/dialogs.c:144 ../src/interface.c:691 +msgid "_View" +msgstr "_Usicht" + +#: ../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 "" +"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 +msgid "Detect by file extension" +msgstr "Aus der Endung vum Fichier erausfannen" + +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +msgid "Detect from file" +msgstr "Aus dem Fichier erausfannen" + +#: ../src/dialogs.c:258 +msgid "_More Options" +msgstr "_Méi Optiounen" + +#. line 1 with checkbox and encoding combo +#: ../src/dialogs.c:265 +msgid "Show _hidden files" +msgstr "_Verstoppten Fichieren uweisen" + +#: ../src/dialogs.c:276 +msgid "Set encoding:" +msgstr "Zeechencodéierung setzen:" + +#: ../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 "" +"Definéiert d'Zeechencodéierung fir den Fichier, wann se net erausfonnt kann " +"ginn. Dëst ass praktesch wann dier wësst dass Geany d'Zeechencodéierung vum " +"Fichier net kann erausfannen.\n" +"Wann dier en puer Fichieren auswielt, ginn se alleguer mat der ausgewielten " +"Zeechencodéierung opgemaach." + +#. line 2 with filetype combo +#: ../src/dialogs.c:293 +msgid "Set filetype:" +msgstr "Den Typ vun Fichier definéiren" + +#: ../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 "" +"Definéiert den Fichierstyp fir den Fichier, wann en net mat der Endung " +"erausfonnt kann ginn.\n" +"Wann dier en puer Fichieren auswielt, ginn se alleguer mat dem ausgewielten " +"Fichierstyp opgemaach." + +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "I_wwerschreiwen" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 +msgid "Save File" +msgstr "Fichier späicheren" + +#: ../src/dialogs.c:432 +msgid "R_ename" +msgstr "Ëmb_enennen" + +#: ../src/dialogs.c:434 +msgid "Save the file and rename it" +msgstr "Den Fichier späicheren an ëmbenennen" + +#: ../src/dialogs.c:442 +msgid "_Open file in a new tab" +msgstr "Fichier an engem neien tab _opmaachen" + +#: ../src/dialogs.c:444 +msgid "" +"Keep the current unsaved document open and open the newly saved file in a " +"new tab" +msgstr "" +"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 +msgid "Error" +msgstr "Feeler" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Fro" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Warnung" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informatioun" + +#: ../src/dialogs.c:656 +msgid "_Don't save" +msgstr "_Net späicheren" + +#: ../src/dialogs.c:687 +#, c-format +msgid "The file '%s' is not saved." +msgstr "Den Fichier '%s' ass net gespäichert." + +#: ../src/dialogs.c:689 +msgid "Do you want to save it before closing?" +msgstr "Well dier virum zoumaachen späicheren?" + +#: ../src/dialogs.c:764 +msgid "Choose font" +msgstr "Schrëft auswielen" + +#: ../src/dialogs.c:1005 +msgid "" +"An error occurred or file information could not be retrieved (e.g. from a " +"new file)." +msgstr "" +"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 +msgid "unknown" +msgstr "onbekannt" + +#: ../src/dialogs.c:1039 ../src/symbols.c:780 +msgid "Properties" +msgstr "Eegenschaften" + +#: ../src/dialogs.c:1070 +msgid "Type:" +msgstr "Typ" + +#: ../src/dialogs.c:1084 +msgid "Size:" +msgstr "Gréisst:" + +#: ../src/dialogs.c:1100 +msgid "Location:" +msgstr "Plaz:" + +#: ../src/dialogs.c:1114 +msgid "Read-only:" +msgstr "Schreifgeschützt:" + +#: ../src/dialogs.c:1121 +msgid "(only inside Geany)" +msgstr "(nëmmen am Geany)" + +#: ../src/dialogs.c:1130 +msgid "Encoding:" +msgstr "Zeechencodéierung:" + +#. BOM = byte order mark +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +msgid "(with BOM)" +msgstr "(mat BOM)" + +#: ../src/dialogs.c:1140 +msgid "(without BOM)" +msgstr "(ouni BOM)" + +#: ../src/dialogs.c:1151 +msgid "Modified:" +msgstr "Modifiéiert:" + +#: ../src/dialogs.c:1165 +msgid "Changed:" +msgstr "Geännert:" + +#: ../src/dialogs.c:1179 +msgid "Accessed:" +msgstr "Zougrëff:" + +#: ../src/dialogs.c:1201 +msgid "Permissions:" +msgstr "Zougrëffsrechter:" + +#. Header +#: ../src/dialogs.c:1209 +msgid "Read:" +msgstr "Liesen:" + +#: ../src/dialogs.c:1216 +msgid "Write:" +msgstr "Schreiwen:" + +#. Owner +#: ../src/dialogs.c:1231 +msgid "Owner:" +msgstr "Besëtzer:" + +#. Group +#: ../src/dialogs.c:1267 +msgid "Group:" +msgstr "Grupp:" + +#. Other +#: ../src/dialogs.c:1303 +msgid "Other:" +msgstr "Anerer" + +#: ../src/document.c:622 +#, c-format +msgid "File %s closed." +msgstr "Den Fichier %s as zou" + +#: ../src/document.c:745 +#, c-format +msgid "New file \"%s\" opened." +msgstr "Neien Fichier \"%s\" opgemaach." + +#: ../src/document.c:918 ../src/document.c:1421 +#, c-format +msgid "Could not open file %s (%s)" +msgstr "Konnt den fichier %s (%s) net opmaachen" + +#: ../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 "" +"Den Fichier \"%s\" konnt net richteg opgemaach ginn an ass ofgeschnidden " +"ginn. Dëst kann virkommen wann den Fichier en NULL Byte enthält. Wann dier " +"den Fichier elo späichert, kinnt dier Donnéeën verléieren. Den Fichier gouf " +"als schreifgeschützt agestallt." + +#. 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 "Den Fichier \"%s\" as keen gültegen %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 "" +"Den Fichier \"%s\" ass keen Text Fichier oder d'Zeechencodéierung gëtt net " +"ënnerstetzt" + +#: ../src/document.c:1122 +msgid "Spaces" +msgstr "Espacen" + +#: ../src/document.c:1125 +msgid "Tabs" +msgstr "Tabs" + +#: ../src/document.c:1128 +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 +#, c-format +msgid "Setting %s indentation mode for %s." +msgstr "Stellt den Aréckungsmodus %s fir %s an." + +#: ../src/document.c:1186 +msgid "Invalid filename" +msgstr "Den Numm vum Fichier as ongülteg" + +#: ../src/document.c:1309 +#, c-format +msgid "File %s reloaded." +msgstr "Fichier %s nei gelueden" + +#. 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 "Fichier %s opgemach(%d%s)" + +#: ../src/document.c:1316 +msgid ", read-only" +msgstr ", schreifgeschützt" + +#: ../src/document.c:1512 +msgid "Error renaming file." +msgstr "Feeler beim ëmbenennen vum Fichier" + +#: ../src/document.c:1587 +#, c-format +msgid "" +"An error occurred while converting the file from UTF-8 in \"%s\". The file " +"remains unsaved." +msgstr "" +"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 +#, c-format +msgid "" +"Error message: %s\n" +"The error occurred at \"%s\" (line: %d, column: %d)." +msgstr "" +"Feelermeldung: %s\n" +"Et as en Feeler em \"%s\" (Zeil: %d, Kolonn: %d) geschitt." + +#: ../src/document.c:1614 +#, c-format +msgid "Error message: %s." +msgstr "Feelermeldung: %s." + +#: ../src/document.c:1715 ../src/document.c:1775 +msgid "Error saving file." +msgstr "Feeler beim späicheren vum Fichier" + +#: ../src/document.c:1774 +#, c-format +msgid "Error saving file (%s)." +msgstr "Feeler beim späicheren vum Fichier (%s)." + +#: ../src/document.c:1799 +#, c-format +msgid "File %s saved." +msgstr "Fichier %s gespäichert." + +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 +#, c-format +msgid "\"%s\" was not found." +msgstr "\"%s\" konnt net fonnt ginn." + +#: ../src/document.c:1932 +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 +#, c-format +msgid "No matches found for \"%s\"." +msgstr "Keng Iwwerteneestëmmung fond fir \"%s\"." + +#: ../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: %d mol gouf \"%s\" duerch \"%s\" ersaat." +msgstr[1] "%s: %d mol gouf \"%s\" duerch \"%s\" ersaat." + +#: ../src/document.c:2868 +msgid "Do you want to reload it?" +msgstr "Wierklech nei lueden?" + +#: ../src/document.c:2869 +#, c-format +msgid "" +"The file '%s' on the disk is more recent than\n" +"the current buffer." +msgstr "" +"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:2891 +#, c-format +msgid "File \"%s\" was not found on disk!" +msgstr "Den Fichier \"%s\" konnt net fonnt gin!" + +#: ../src/editor.c:4288 +msgid "Enter Tab Width" +msgstr "Breet vun engem Tab aginn" + +#: ../src/editor.c:4289 +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/encodings.c:76 +msgid "Celtic" +msgstr "Keltesch" + +#: ../src/encodings.c:77 ../src/encodings.c:78 +msgid "Greek" +msgstr "Griichesch" + +#: ../src/encodings.c:79 +msgid "Nordic" +msgstr "Nordesch" + +#: ../src/encodings.c:80 +msgid "South European" +msgstr "Südeuropäesch" + +#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 +#: ../src/encodings.c:84 +msgid "Western" +msgstr "Westlech" + +#: ../src/encodings.c:86 ../src/encodings.c:87 ../src/encodings.c:88 +msgid "Baltic" +msgstr "Baltesch" + +#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +msgid "Central European" +msgstr "Zentraleuropäesch" + +#. 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 "Kyrillesch" + +#: ../src/encodings.c:98 +msgid "Cyrillic/Russian" +msgstr "Kyrillesch/Russesch" + +#: ../src/encodings.c:99 +msgid "Cyrillic/Ukrainian" +msgstr "Kyrillesch/Ukrainesch" + +#: ../src/encodings.c:100 +msgid "Romanian" +msgstr "Rumänesch" + +#: ../src/encodings.c:102 ../src/encodings.c:103 ../src/encodings.c:104 +msgid "Arabic" +msgstr "Arabesch" + +#. not available at all, ? +#: ../src/encodings.c:105 ../src/encodings.c:107 ../src/encodings.c:108 +msgid "Hebrew" +msgstr "Hebräesch" + +#: ../src/encodings.c:109 +msgid "Hebrew Visual" +msgstr "Hebräesch visuell" + +#: ../src/encodings.c:111 +msgid "Armenian" +msgstr "Armenesch" + +#: ../src/encodings.c:112 +msgid "Georgian" +msgstr "Georgesch" + +#: ../src/encodings.c:113 +msgid "Thai" +msgstr "Thai" + +#: ../src/encodings.c:114 ../src/encodings.c:115 ../src/encodings.c:116 +msgid "Turkish" +msgstr "Türkesch" + +#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 +msgid "Vietnamese" +msgstr "Vietnamesesch" + +#: ../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 "Vereinfacht chinesesch" + +#: ../src/encodings.c:135 ../src/encodings.c:136 ../src/encodings.c:137 +msgid "Chinese Traditional" +msgstr "Traditionellt chinesesch" + +#: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 +msgid "Japanese" +msgstr "Japanesch" + +#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:145 +msgid "Korean" +msgstr "Koreanesch" + +#: ../src/encodings.c:147 +msgid "Without encoding" +msgstr "Ouni Zeechencodéierung" + +#: ../src/encodings.c:374 +msgid "_West European" +msgstr "_Westeuropäesch" + +#: ../src/encodings.c:380 +msgid "_East European" +msgstr "Ost_europäesch" + +#: ../src/encodings.c:386 +msgid "East _Asian" +msgstr "Ost_asiatesch" + +#: ../src/encodings.c:392 +msgid "_SE & SW Asian" +msgstr "_Südost & Südwest Asien" + +#: ../src/encodings.c:398 +msgid "_Middle Eastern" +msgstr "_Mëttleren Osten" + +#: ../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 "%s Quellcode Fichier" + +#: ../src/filetypes.c:97 +#, 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 +msgid "None" +msgstr "Ouni" + +#: ../src/filetypes.c:382 +msgid "Shell script file" +msgstr "Shell Skript Fichier" + +#: ../src/filetypes.c:394 +msgid "Makefile" +msgstr "Makefile" + +#: ../src/filetypes.c:406 +msgid "XML document" +msgstr "XML Dokument" + +#: ../src/filetypes.c:441 +msgid "Cascading StyleSheet" +msgstr "Cascading StyleSheet" + +#: ../src/filetypes.c:452 +msgid "SQL Dump file" +msgstr "SQL Dump Fichier" + +#: ../src/filetypes.c:496 +msgid "Config file" +msgstr "Config Fichier" + +#: ../src/filetypes.c:508 +msgid "Gettext translation file" +msgstr "Fichier mat enger Gettext Iwwersetzung" + +#: ../src/filetypes.c:541 +#, c-format +msgid "%s script file" +msgstr "%s Skript Fichier" + +#: ../src/filetypes.c:738 +msgid "_Programming Languages" +msgstr "_Programméiersproochen" + +#: ../src/filetypes.c:739 +msgid "_Scripting Languages" +msgstr "_Skriptsproochen" + +#: ../src/filetypes.c:740 +msgid "_Markup Languages" +msgstr "_Markup Sproochen" + +#: ../src/filetypes.c:741 +msgid "M_iscellaneous Languages" +msgstr "_Aner Sproochen" + +#: ../src/filetypes.c:1331 ../src/win32.c:107 +msgid "All Source" +msgstr "All d'Quellen" + +#: ../src/filetypes.c:1356 ../src/project.c:292 +msgid "All files" +msgstr "All d'Fichieren" + +#: ../src/filetypes.c:1414 +#, 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 +msgid "untitled" +msgstr "ouni Titel" + +#: ../src/interface.c:276 +msgid "_File" +msgstr "_Fichier" + +#: ../src/interface.c:287 +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 +msgid "Open Selected F_ile" +msgstr "Ausgewielten F_ichier opmaachen" + +#: ../src/interface.c:315 +msgid "Recent _Files" +msgstr "_Fir d'läscht opgemaach" + +#: ../src/interface.c:332 +msgid "Save A_ll" +msgstr "A_ll späicheren" + +#: ../src/interface.c:348 +msgid "R_eload As" +msgstr "Nei _lueden als" + +#: ../src/interface.c:376 +msgid "Page Set_up" +msgstr "Saitenastell_ungen" + +#: ../src/interface.c:393 ../src/notebook.c:240 +msgid "Close Ot_her Documents" +msgstr "Aner Dokumenter _zoumaachen" + +#: ../src/interface.c:401 ../src/notebook.c:245 +msgid "C_lose All" +msgstr "A_lles zoumaachen" + +#: ../src/interface.c:418 +msgid "_Edit" +msgstr "B_eaarbeschten" + +#: ../src/interface.c:468 ../src/interface.c:1949 +msgid "_Format" +msgstr "_Formateiren" + +#: ../src/interface.c:475 ../src/interface.c:1956 +msgid "T_oggle Case of Selection" +msgstr "Gr_ouss an Klengschreiwen an der Auswiel vertauschen" + +#: ../src/interface.c:484 ../src/interface.c:1965 +msgid "_Comment Line(s)" +msgstr "Zeil(en) _kommentéiren" + +#: ../src/interface.c:488 ../src/interface.c:1969 +msgid "U_ncomment Line(s)" +msgstr "Zeil(en) auskomme_ntéiren" + +#: ../src/interface.c:492 ../src/interface.c:1973 +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 +msgid "_Increase Indent" +msgstr "Mé_i arécken" + +#: ../src/interface.c:513 ../src/interface.c:1994 +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:530 ../src/interface.c:2011 +msgid "_Send Selection to" +msgstr "Au_swiel verschécken un" + +#: ../src/interface.c:545 ../src/interface.c:2026 +msgid "I_nsert Comments" +msgstr "Kommentar _afügen" + +#: ../src/interface.c:556 ../src/interface.c:2037 +msgid "Insert _ChangeLog Entry" +msgstr "_Changelog Entrée androen " + +#: ../src/interface.c:560 ../src/interface.c:2041 +msgid "Insert File _Header" +msgstr "_Kappzeil afügen" + +#: ../src/interface.c:564 ../src/interface.c:2045 +msgid "Insert _Function Description" +msgstr "Beschreiwung vun der _Fonctioun afügen" + +#: ../src/interface.c:568 ../src/interface.c:2049 +msgid "Insert _Multiline Comment" +msgstr "En puer Zeilen laangen Ko_mmentar afügen" + +#: ../src/interface.c:572 ../src/interface.c:2053 +msgid "Insert _GPL Notice" +msgstr "_GPL Notiz afügen" + +#: ../src/interface.c:576 ../src/interface.c:2057 +msgid "Insert _BSD License Notice" +msgstr "_BSD Lizenz Notiz afügen" + +#: ../src/interface.c:580 ../src/interface.c:2061 +msgid "Insert Dat_e" +msgstr "Datum afüg_en" + +#: ../src/interface.c:594 ../src/interface.c:2075 +msgid "_Insert \"include <...>\"" +msgstr " \"include <...>\" _afügen" + +#: ../src/interface.c:613 +msgid "Preference_s" +msgstr "A_stellungen" + +#: ../src/interface.c:621 +msgid "_Search" +msgstr "_Sichen" + +#: ../src/interface.c:632 +msgid "Find _Next" +msgstr "_Nächsten fannen" + +#: ../src/interface.c:636 +msgid "Find _Previous" +msgstr "_Viregen fannen" + +#: ../src/interface.c:640 +msgid "Find in F_iles" +msgstr "An den F_ichieren fannen" + +#: ../src/interface.c:644 ../src/search.c:524 +msgid "_Replace" +msgstr "E_rsetzen" + +#: ../src/interface.c:657 +msgid "Find _Selected" +msgstr "Au_swiel fannen" + +#: ../src/interface.c:661 +msgid "Find Pre_vious Selected" +msgstr "Sélectioun vun _virdrun fannen" + +#: ../src/interface.c:670 +msgid "Next _Message" +msgstr "Nächsten _Message" + +#: ../src/interface.c:674 +msgid "Pr_evious Message" +msgstr "M_essage vun virdrun" + +#: ../src/interface.c:683 ../src/interface.c:2127 +msgid "_Go to Line" +msgstr "Zur Zeil _goen" + +#: ../src/interface.c:698 +msgid "Change _Font" +msgstr "Schrë_ft änneren" + +#: ../src/interface.c:711 +msgid "To_ggle All Additional Widgets" +msgstr "_Zousätzlech Infofënsteren aus- oder ablennen" + +#: ../src/interface.c:715 +msgid "Full_screen" +msgstr "Vollbild_schierm" + +#: ../src/interface.c:719 +msgid "Show Message _Window" +msgstr "Noriichtenfënster u_weisen" + +#: ../src/interface.c:724 +msgid "Show _Toolbar" +msgstr "_Geschirleescht uweisen" + +#: ../src/interface.c:729 +msgid "Show Side_bar" +msgstr "Säitenleescht u_weisen" + +#: ../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 "_Markéierungsrand uweisen" + +#: ../src/interface.c:746 +msgid "Show _Line Numbers" +msgstr "Zei_lennummer uweisen" + +#: ../src/interface.c:751 +msgid "Show _White Space" +msgstr "Espacen u_weisen" + +#: ../src/interface.c:755 +msgid "Show Line _Endings" +msgstr "Zeilen_enn uweisen" + +#: ../src/interface.c:759 +msgid "Show _Indentation Guides" +msgstr "_Aréckungshëllef uweisen" + +#: ../src/interface.c:780 +msgid "_Document" +msgstr "_Dokument" + +#: ../src/interface.c:787 +msgid "_Line Wrapping" +msgstr "Opteschen Zei_lenëmbroch" + +#: ../src/interface.c:792 +msgid "Line _Breaking" +msgstr "Zeilenem_broch" + +#: ../src/interface.c:796 +msgid "_Auto-indentation" +msgstr "_Automatesch arécken" + +#: ../src/interface.c:801 +msgid "In_dent Type" +msgstr "Type vun _Aréckung" + +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +msgid "_Tabs" +msgstr "_Tabs" + +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +msgid "_Spaces" +msgstr "_Espacen" + +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +msgid "T_abs and Spaces" +msgstr "T_abs an Espacen" + +#: ../src/interface.c:831 +msgid "Read _Only" +msgstr "_Nëmmen liesen" + +#: ../src/interface.c:835 +msgid "_Write Unicode BOM" +msgstr "Unicode BOM schrei_wen" + +#: ../src/interface.c:844 +msgid "Set File_type" +msgstr "Den _Typ vun Fichier definéiren" + +#: ../src/interface.c:854 +msgid "Set _Encoding" +msgstr "Z_eechencodéierung setzen" + +#: ../src/interface.c:864 +msgid "Set Line E_ndings" +msgstr "Zeilen_enn festleeën" + +#: ../src/interface.c:871 +msgid "Convert and Set to _CR/LF (Win)" +msgstr "Konvertéieren an anstellen op _CR/LF (Win)" + +#: ../src/interface.c:877 +msgid "Convert and Set to _LF (Unix)" +msgstr "Konvertéieren an anstellen op _LF (Unix)" + +#: ../src/interface.c:883 +msgid "Convert and Set to CR (_Mac)" +msgstr "Konvertéieren an anstellen op CR (_Mac)" + +#: ../src/interface.c:894 +msgid "_Strip Trailing Spaces" +msgstr "Of_stänn um Zeilenenn läschen" + +#: ../src/interface.c:898 +msgid "_Replace Tabs by Spaces" +msgstr "Tabulatoren duerch Ofstänn e_rsetzen" + +#: ../src/interface.c:902 +msgid "Replace Spaces b_y Tabs" +msgstr "_Ofstänn duerch Tabulatoren ersetzen" + +#: ../src/interface.c:911 +msgid "_Fold All" +msgstr "Alles Zesumme_klappen" + +#: ../src/interface.c:915 +msgid "_Unfold All" +msgstr "Alles Era_usklappen" + +#: ../src/interface.c:924 +msgid "Remove _Markers" +msgstr "_Markéierung ewechmaachen" + +#: ../src/interface.c:928 +msgid "Remove Error _Indicators" +msgstr "Feelermarké_ierungen ewechmaachen" + +#: ../src/interface.c:932 +msgid "_Project" +msgstr "_Projet" + +#: ../src/interface.c:939 +msgid "_New" +msgstr "_Nei" + +#: ../src/interface.c:947 +msgid "_Open" +msgstr "_Opmaachen" + +#: ../src/interface.c:955 +msgid "_Recent Projects" +msgstr "Fi_r d'läscht opgematen Projeten" + +#: ../src/interface.c:959 +msgid "_Close" +msgstr "_Zoumaachen" + +#: ../src/interface.c:980 +msgid "_Tools" +msgstr "_Geschir" + +#: ../src/interface.c:987 +msgid "_Color Chooser" +msgstr "_Faarwe auswielen" + +#: ../src/interface.c:995 +msgid "_Word Count" +msgstr "_Wierder zielen" + +#: ../src/interface.c:999 +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 +msgid "_Help" +msgstr "_Hëllef" + +#: ../src/interface.c:1026 +msgid "_Website" +msgstr "_Websäit" + +#: ../src/interface.c:1030 +msgid "_Keyboard Shortcuts" +msgstr "_Kierzel" + +#: ../src/interface.c:1034 +msgid "_Debug Messages" +msgstr "_Debug Messagen" + +#: ../src/interface.c:1073 ../src/treeviews.c:119 +msgid "Symbols" +msgstr "Symboler" + +#: ../src/interface.c:1087 +msgid "Documents" +msgstr "Dokumenter" + +#: ../src/interface.c:1123 +msgid "Status" +msgstr "Status" + +#: ../src/interface.c:1137 +msgid "Compiler" +msgstr "Compiler" + +#: ../src/interface.c:1152 +msgid "Messages" +msgstr "Messagen" + +#: ../src/interface.c:1165 +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 +#, fuzzy +msgid "_Customize Toolbar" +msgstr "Gesc_hirleescht verstoppen" + +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "Gesc_hirleescht verstoppen" + +#: ../src/interface.c:2094 +msgid "Find _Usage" +msgstr "_An allen Dokumenter nosichen" + +#: ../src/interface.c:2102 +msgid "Find _Document Usage" +msgstr "Am _Dokument nosichen" + +#: ../src/interface.c:2110 +msgid "Go to _Tag Definition" +msgstr "Bei d'Definitioun vum _Tag goen" + +#: ../src/interface.c:2114 +msgid "Go to T_ag Declaration" +msgstr "Bei d'Declaratioun vum T_ag goen" + +#: ../src/interface.c:2118 +msgid "Conte_xt Action" +msgstr "Konte_xt Aktioun" + +#: ../src/interface.c:2667 ../src/keybindings.c:337 +msgid "Preferences" +msgstr "Astellungen" + +#: ../src/interface.c:2703 +msgid "Load files from the last session" +msgstr "Fichieren aus der leschter Sëtzung lueden" + +#: ../src/interface.c:2706 +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 +msgid "Load virtual terminal support" +msgstr "Ënnerstëtzung fir en virtuellen Terminal lueden" + +#: ../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 "" +"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 +msgid "Enable plugin support" +msgstr "PlugIn Ënnerstëtzung aschalten" + +#: ../src/interface.c:2716 +msgid "Startup" +msgstr "Starten" + +#: ../src/interface.c:2735 +msgid "Save window position and geometry" +msgstr "Positioun an d'Mossen vun der Fënster späicheren" + +#: ../src/interface.c:2738 +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 +msgid "Confirm exit" +msgstr "Ophalen bestätegen" + +#: ../src/interface.c:2743 +msgid "Shows a confirmation dialog on exit" +msgstr "En Dialog uweisen fir d'Erausgoen ze bestätegen" + +#: ../src/interface.c:2745 +msgid "Shutdown" +msgstr "Ausschalten" + +#: ../src/interface.c:2766 +msgid "Startup path:" +msgstr "Startpad:" + +#: ../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 "" +"Startpad wann Dateien opgemaach oder gespäichert sollen ginn. Den Pad muss " +"absolut sinn. Fir den aktuellen Aarbeschtsordner ze benotzen loosst d'Feld " +"eidel." + +#: ../src/interface.c:2791 +msgid "Project files:" +msgstr "Fichieren vum Projet:" + +#: ../src/interface.c:2803 +msgid "Path to start in when opening project files" +msgstr "Pad fir Projetsfichieren opzemaachen" + +#: ../src/interface.c:2816 +msgid "Extra plugin path:" +msgstr "Extra PlugIn Pad" + +#: ../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 kontrolléiert standardméisseg den Installatiounsordner an den " +"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 +msgid "Paths" +msgstr "Weeër" + +#: ../src/interface.c:2846 +msgid "Startup" +msgstr "Ufänken" + +#: ../src/interface.c:2868 +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 +msgid "" +"Whether to beep if an error occurred or when the compilation process has " +"finished" +msgstr "" +"Ob en Pieptoun ausginn gëtt wann en Feeler optrëtt oder wann den " +"Compiléierviergang eriwwer ass" + +#: ../src/interface.c:2873 +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 +msgid "" +"Switch to the status message tab (in the notebook window at the bottom) if a " +"new status message arrives" +msgstr "" +"Wiesselt automatesch an den Tab mat den Statusmeldungen am Infoberäich, wann " +"eng nei Statusmeldung do ass." + +#: ../src/interface.c:2878 +msgid "Suppress status messages in the status bar" +msgstr "Keng Statusmeldungen an der Statuszeil uweisen" + +#: ../src/interface.c:2881 +msgid "" +"Removes all messages from the status bar. The messages are still displayed " +"in the status messages window." +msgstr "" +"Läscht all d'Meldungen an der Statuszeil. D'Meldungen ginn nach ëmmer an der " +"Fënster fir Statusmeldungen ugewisen." + +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" +msgstr "Autofokus (den Fokus geet der Maus no)" + +#: ../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 "" +"Fokusséiert automatesch déi Fënster ënnert dem Mauszeiger. Fonctionnéiert " +"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 +msgid "Miscellaneous" +msgstr "Verschiddenes" + +#: ../src/interface.c:2908 +msgid "Always wrap search and hide the Find dialog" +msgstr "Ëmmer dat ganzt Dokument duerchsichen an d'Sichfënster verstoppen" + +#: ../src/interface.c:2911 +msgid "" +"Always wrap search around the document and hide the Find dialog after " +"clicking Find Next/Previous" +msgstr "" +"Ëmmer dat ganzt Dokument duerchsichen an den Sich-Dialog beim Klicken op " +"Nächsten/Viregen zoumaachen" + +#: ../src/interface.c:2913 +msgid "Use the current word under the cursor for Find dialogs" +msgstr "Dat Wuert ennert dem Curseur sichen" + +#: ../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 "Benotzt dat Wuert ënnert dem Curseur beim Sichen an Ersetzen" + +#: ../src/interface.c:2918 +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 +msgid "Search" +msgstr "Sichen" + +#: ../src/interface.c:2941 +msgid "Use project-based session files" +msgstr "Sëtzung am Projet späichern an erëm opmaachen" + +#: ../src/interface.c:2944 +msgid "" +"Whether to store a project's session files and open them when re-opening the " +"project" +msgstr "" +"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 +msgid "Store project file inside the project base directory" +msgstr "Projetsfichier am Projetsbasisordner erstellen" + +#: ../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 "" +"Wann aktivéiert, dann gëtt en Projetsfichier standardméisseg am " +"Projetsbasisordner gespäichert wann en neien Projet erstallt gëtt aplaz am " +"Ordner iwwert dem Basisordner. Dier kënnt den Pad vum Projetsfichier nach " +"ëmmer am 'Neie Projet' Dialog änneren." + +#: ../src/interface.c:2951 +msgid "Projects" +msgstr "Projeten" + +#: ../src/interface.c:2956 +msgid "Miscellaneous" +msgstr "Verschiddenes" + +#: ../src/interface.c:2960 +msgid "General" +msgstr "Allgemeng" + +#: ../src/interface.c:2983 +msgid "Show symbol list" +msgstr "Lëscht mat den Symboler uweisen" + +#: ../src/interface.c:2986 +msgid "Toggle the symbol list on and off" +msgstr "Lescht mat den Symboler un an ausschalten" + +#: ../src/interface.c:2988 +msgid "Show documents list" +msgstr "Lëscht mat den Fichieren uweisen" + +#: ../src/interface.c:2991 +msgid "Toggle the documents list on and off" +msgstr "Lescht mat den Dokumenter un an ausschalten " + +#: ../src/interface.c:2993 +msgid "Sidebar" +msgstr "Saitenleescht" + +#: ../src/interface.c:3014 +msgid "Symbol list:" +msgstr "Lëscht mat den Symboler" + +#: ../src/interface.c:3021 ../src/interface.c:3136 +msgid "Message window:" +msgstr "Noriichtenfënster:" + +#: ../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 "D'Schrëft fir d'Noriichtenfënster astellen." + +#: ../src/interface.c:3048 +msgid "Sets the font for the symbol list" +msgstr "Stellt d'Schrëft fir d'Symbollescht an" + +#: ../src/interface.c:3056 +msgid "Sets the editor font" +msgstr "Stellt d'Schrëft vum Editor an" + +#: ../src/interface.c:3058 +msgid "Fonts" +msgstr "Schrëften" + +#: ../src/interface.c:3077 +msgid "Show editor tabs" +msgstr "Tabs vum Editor uweisen" + +#: ../src/interface.c:3081 +msgid "Show close buttons" +msgstr "Knäppchen fir zouzemaachen uweisen" + +#: ../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 "" +"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 +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 +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 +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 +msgid "Double-clicking hides all additional widgets" +msgstr "Duebel-klicken verstoppt all déi zousätzlech Fënsteren" + +#: ../src/interface.c:3113 +msgid "Calls the View->Toggle All Additional Widgets command" +msgstr "Rifft d'Commande Usicht->Zousätzlech Infofënstern an/ausblennen" + +#: ../src/interface.c:3115 +msgid "Editor tabs" +msgstr "Editor Tabs" + +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +msgid "Top" +msgstr "Uewen" + +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +msgid "Bottom" +msgstr "Ënnen" + +#: ../src/interface.c:3154 +msgid "Sidebar:" +msgstr "Saitenleescht:" + +#: ../src/interface.c:3190 +msgid "Tab positions" +msgstr "Tab Positioun" + +#: ../src/interface.c:3209 +msgid "Show status bar" +msgstr "Statusleescht uweisen" + +#: ../src/interface.c:3212 +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 +#, fuzzy +msgid "Interface" +msgstr "Interface" + +#: ../src/interface.c:3242 +msgid "Show T_oolbar" +msgstr "_Geschirleescht uweisen" + +#: ../src/interface.c:3246 +msgid "_Append Toolbar to the Menu" +msgstr "_Geschirleescht un den Menü unhänken" + +#: ../src/interface.c:3249 +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 +#, fuzzy +msgid "Customize Toolbar" +msgstr "_Geschirleescht uweisen" + +#: ../src/interface.c:3363 +msgid "Toolbar" +msgstr "Geschirleescht" + +#: ../src/interface.c:3390 +msgid "Line wrapping" +msgstr "Visuellen Zeilenëmbroch" + +#: ../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 "" +"Mëscht bei laangen Zeilen en Ëmbroch um Bord vun der Fënster an setzt se an " +"der nächster Zeil fort. Opgepasst: Bei groussen Dokumenter erfuerdert den " +"Zeilenëmbroch vill Rechenleeschtung an sollt dowéinst op méi luesen " +"Maschinnen deaktivéiert ginn." + +#: ../src/interface.c:3395 +msgid "Enable \"smart\" home key" +msgstr "\"Intelligenten\" Home Knäppchen aschalten" + +#: ../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 "" +"Wann déi intelligent Pos1-Tast (Home) aktivéiert ass, spréngt en Curseur " +"beim Tastendrock bei dat éischt Zeechen vun der Zeil. Wann en schonns do " +"ass, spréngt en zum Ufank vun der Zeil. Wann dës Optioun net aktivéiert ass, " +"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 +msgid "Disable Drag and Drop" +msgstr "Drag and Drop deaktivéieren" + +#: ../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 "" +"Drag and drop vollstänneg an der Editorsfënster deaktivéieren sou dass dier " +"keng Auswiel innerhalb oder ausserhalb vun der Editorsfënster méi kënnt hin " +"an hier beweegen." + +#: ../src/interface.c:3405 +msgid "Enable folding" +msgstr "Eranklappen aschalten" + +#: ../src/interface.c:3408 +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 +msgid "Fold/unfold all children of a fold point" +msgstr "All ënnergeuerdnet Quellcodebléck eran/erausklappen" + +#: ../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 "" +"Eran- oder Erausklappen vun allen Ënnerpunkten vun engem Quellcodeblock. Bei " +"gedréckter Shift Tast gëtt den Géigendeel gemat wann op d'Symbol geklickt " +"gëtt." + +#: ../src/interface.c:3415 +msgid "Use indicators to show compile errors" +msgstr "Markéierungen benotzen fir Feeler beim compiléieren unzeweisen" + +#: ../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 "" +"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 +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 +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 +msgid "Line breaking column:" +msgstr "Kolonn fir den automateschen Zeilenëmbroch" + +#: ../src/interface.c:3443 +msgid "Comment toggle marker:" +msgstr "Kommentaremschaltzeechen:" + +#: ../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 "" +"Eng Zeechenketten, déi bei engem Zeilenkommentar benotzt gëtt, fir den " +"Kommentar ze markéieren den duerch en Tastenkierzel an- oder ausgeschalt " +"kann ginn." + +#: ../src/interface.c:3452 +msgid "Features" +msgstr "Fonctiounen" + +#: ../src/interface.c:3457 +msgid "Features" +msgstr "Fonctiounen" + +#: ../src/interface.c:3489 ../src/interface.c:5057 +msgid "Auto-indent mode:" +msgstr "Automatesch arécken Modus:" + +#: ../src/interface.c:3502 ../src/interface.c:5070 +msgid "Basic" +msgstr "Einfach" + +#: ../src/interface.c:3503 ../src/interface.c:5071 +msgid "Current chars" +msgstr "Momentan Buschtawen" + +#: ../src/interface.c:3504 ../src/interface.c:5072 +msgid "Match braces" +msgstr "Klameren déi iwwerteneestëmmen" + +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +msgid "Type:" +msgstr "Typ:" + +#: ../src/interface.c:3513 ../src/interface.c:5081 +msgid "Width:" +msgstr "Breet:" + +#: ../src/interface.c:3526 ../src/interface.c:5094 +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 +msgid "Use spaces when inserting indentation" +msgstr "Espacen benotzen fir anzerécken." + +#: ../src/interface.c:3545 ../src/interface.c:5113 +msgid "Use one tab per indent" +msgstr "Een Tab pro Aréckung benotzen" + +#: ../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 "" +"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 +msgid "" +"Whether to detect the indentation type from file contents when a file is " +"opened" +msgstr "" +"Ob den Aréckungstyp mat Hëllef vum Inhalt vum Fichier beim opmaachen vum " +"Fichier soll erausfonnt ginn" + +#: ../src/interface.c:3589 +msgid "Tab key indents" +msgstr "Mat der Tabulator Tast arécken" + +#: ../src/interface.c:3592 +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 +msgid "Indentation" +msgstr "Aréckung:" + +#: ../src/interface.c:3599 ../src/interface.c:5157 +msgid "Indentation" +msgstr "Aréckung" + +#: ../src/interface.c:3622 +msgid "Snippet completion" +msgstr "Code Vervollstännegung" + +#: ../src/interface.c:3625 +msgid "" +"Type a defined short character sequence and complete it to a more complex " +"string using a single keypress" +msgstr "" +"Duerch drécken vun enger Tast en kuerzt Stéck Code zu engem méi komplexen " +"Text erweideren" + +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" +msgstr "Automatesch XML Tag Vervollstännegung" + +#: ../src/interface.c:3630 +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 +msgid "Automatic continuation of multi-line comments" +msgstr "Automatesch weiderfueren bei Kommentaren iwwert en puer Zeilen" + +#: ../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 "" +"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 +msgid "Autocomplete symbols" +msgstr "" + +#: ../src/interface.c:3640 +msgid "" +"Automatic completion of known symbols in open files (function names, global " +"variables, ...)" +msgstr "" +"Automatesch Vervollstännegung vun bekannten Symboler an oppenen Fichieren " +"(Fonctiounsnimm, global variabelen, ...)" + +#: ../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 "Max. Unzuel un Virschléi fir Vervollstännegung vun Symboler:" + +#: ../src/interface.c:3663 +msgid "Completion list height:" +msgstr "Heischt vun Wuertvervollstännegungslescht" + +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" +msgstr "Unzuel un agetippten Zeechen fir d'Wuertvervollstännegung:" + +#: ../src/interface.c:3683 +#, fuzzy +msgid "" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" +msgstr "" +"D'Unzuel un Zeechen déi néideg sinn, fir d'Lescht mat der automatescher " +"Wuertvervollstännegung unzeweisen" + +#: ../src/interface.c:3692 +#, fuzzy +msgid "Display height in rows for the autocompletion list" +msgstr "Héicht vun der Vervollstännegungslescht" + +#: ../src/interface.c:3701 +#, 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 +msgid "Completions" +msgstr "Vervollstännegungen" + +#: ../src/interface.c:3724 +msgid "Parenthesis ( )" +msgstr "Klameren ( )" + +#: ../src/interface.c:3729 +msgid "Auto-close parenthesis when typing an opening one" +msgstr "Klameren automatesch zoumaachen wann eng Klamer opgemaach gëtt" + +#: ../src/interface.c:3731 +msgid "Single quotes ' '" +msgstr "Einfach Gänseféisercher ' '" + +#: ../src/interface.c:3736 +msgid "Auto-close simple quote when typing an opening one" +msgstr "Einfach Gänseféisercher beim antippen automatesch zoumaachen" + +#: ../src/interface.c:3738 +msgid "Curly brackets { }" +msgstr "Gewellten Klameren" + +#: ../src/interface.c:3743 +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 +msgid "Square brackets [ ]" +msgstr "Eckeg Klameren [ ]" + +#: ../src/interface.c:3750 +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 +msgid "Double quotes \" \"" +msgstr "Duebel Gänseféisercher \" \"" + +#: ../src/interface.c:3757 +msgid "Auto-close double quote when typing an opening one" +msgstr "Duebel Gänseféisercher beim antippen automatesch zoumaachen" + +#: ../src/interface.c:3759 +msgid "Auto-close quotes and brackets" +msgstr "Gänseféisercher an Klammeren automatesch zoumaachen" + +#: ../src/interface.c:3764 +msgid "Completions" +msgstr "Vervollstännegungen" + +#: ../src/interface.c:3787 +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" +msgstr "" +"Wäissen Text op schwaarzem Hannergrond benotzen an all d'Faarwen ëmdréinen, " +"Geany muss duerfir nei gestart ginn" + +#: ../src/interface.c:3792 +msgid "Show indentation guides" +msgstr "Hëllef fir d'Aréckung uweisen" + +#: ../src/interface.c:3795 +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 +msgid "Show white space" +msgstr "Espacen uweisen" + +#: ../src/interface.c:3800 +msgid "Marks spaces with dots and tabs with arrows" +msgstr "Markéiert Ofstänn mat Punkten an Tabulatoren mat Feiler" + +#: ../src/interface.c:3802 +msgid "Show line endings" +msgstr "Zeilenenn uweisen" + +#: ../src/interface.c:3805 +msgid "Shows the line ending character" +msgstr "Zeechen fir Zeilenenn uweisen" + +#: ../src/interface.c:3807 +msgid "Show line numbers" +msgstr "Zeilennummer uweisen" + +#: ../src/interface.c:3810 +msgid "Shows or hides the Line Number margin" +msgstr "Weist oder verstoppt den Rand mat den Zeilennummeren" + +#: ../src/interface.c:3812 +msgid "Show markers margin" +msgstr "Markéierungsrand uweisen" + +#: ../src/interface.c:3815 +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines" +msgstr "" +"Weist oder verstoppt den klengen Rand riets vun den Zeilennummeren, den " +"benotzt gëtt fir d'Markéierungen unzeweisen" + +#: ../src/interface.c:3817 +msgid "Stop scrolling at last line" +msgstr "Um Enn vum Dokument net méi weiderscrollen" + +#: ../src/interface.c:3820 +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 +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:3869 +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 +msgid "Color Chooser" +msgstr "Faarf auswielen" + +#: ../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 "" +"D'Embrochhëllef fir laang Zeilen ass eng denn vertikal Linn an der " +"Editorsfënster. Se hëlleft dobäi laang Zeilen ze markéieren an dobäi op en " +"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 +msgid "Line" +msgstr "Zeil" + +#: ../src/interface.c:3891 +msgid "" +"Prints a vertical line in the editor window at the given cursor position " +"(see below)" +msgstr "" +"Setzt eng vertikal Linn an d'Editorsfënster bei d'Positioun vum Curseur déi " +"uginn gouf (kuckt ënnen)" + +#: ../src/interface.c:3895 +msgid "Background" +msgstr "Hannergrond" + +#: ../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 "" +"D'Hannergrondfaarf vun den Zeechen, déi hannert der Curseurspositioun stin " +"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:3908 +msgid "Long line marker" +msgstr "Zeilenlängt markéieren bei:" + +#: ../src/interface.c:3913 +msgid "Display" +msgstr "Uweisen" + +#: ../src/interface.c:3944 +msgid "Open new documents from the command-line" +msgstr "Nei Fichieren vun der Kommandozeil aus opmaachen" + +#: ../src/interface.c:3947 +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 +msgid "Default end of line characters:" +msgstr "Standard Zeechen fir Zeilenenn:" + +#: ../src/interface.c:3968 +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 +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:4025 +msgid "Use fixed encoding when opening files" +msgstr "Eng bestëmmten Zeechencodéierung beim opmaachen vun Fichieren benotzen" + +#: ../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 "" +"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 +msgid "Encodings" +msgstr "Zeechencodéierungen" + +#: ../src/interface.c:4051 +msgid "Ensure new line at file end" +msgstr "Garantéiert dass déi Läscht Zeil vum Fichier eidel ass." + +#: ../src/interface.c:4054 +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 +msgid "Strip trailing spaces and tabs" +msgstr "Läscht Ofstänn an Tabulatoren um Zeilenenn" + +#: ../src/interface.c:4059 +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 +msgid "Replace tabs by space" +msgstr "Tabs duerch Espacen ersetzen" + +#: ../src/interface.c:4064 +msgid "Replaces all tabs in document by spaces" +msgstr "All Tabs am Dokument duerch Espacen ersetzen" + +#: ../src/interface.c:4066 +msgid "Saving files" +msgstr "Fichieren späicheren" + +#: ../src/interface.c:4091 +msgid "Recent files list length:" +msgstr "Unzuel vun den fir d'läscht opgematen Fichieren:" + +#: ../src/interface.c:4105 +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 +msgid "Disk check timeout:" +msgstr "Zäitintervall zum Préiwen vun Ännerungen um Fichier:" + +#: ../src/interface.c:4122 +msgid "" +"How often to check for changes to document files on disk, in seconds. Zero " +"disables checking." +msgstr "" +"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 +msgid "Files" +msgstr "Fichieren" + +#: ../src/interface.c:4164 +msgid "Make:" +msgstr "Make:" + +#: ../src/interface.c:4171 +msgid "Terminal:" +msgstr "Terminal:" + +#: ../src/interface.c:4178 +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 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"En Terminal Emulator wei xterm, gnome-terminal oder konsole (en sollt den -e " +"Argument unhuelen)" + +#: ../src/interface.c:4204 +msgid "Path (and possibly additional arguments) to your favorite browser" +msgstr "Pad (an aner argumenter) zu ärem Browser" + +#: ../src/interface.c:4236 +msgid "Grep:" +msgstr "Grep:" + +#: ../src/interface.c:4259 +msgid "Tool paths" +msgstr "Pad bei d'Geschir" + +#: ../src/interface.c:4280 +msgid "Context action:" +msgstr "Kontext Aktioun:" + +#: ../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 "" +"Kontextaktiouns Commande. Dat aktuell ausgewielten Wuert kann mat %s benotzt " +"ginn. Et kann iwwerall an der Commande virkommen an gëtt virun der " +"Ausféierung ersat." + +#: ../src/interface.c:4304 +msgid "Commands" +msgstr "Commanden" + +#: ../src/interface.c:4309 ../src/keybindings.c:496 +msgid "Tools" +msgstr "Geschir" + +#: ../src/interface.c:4343 +msgid "email address of the developer" +msgstr "E-mail Adress vum Entwéckler" + +#: ../src/interface.c:4350 +msgid "Initials of the developer name" +msgstr "Initialen vum Numm vun Entwéckler" + +#: ../src/interface.c:4352 +msgid "Initial version:" +msgstr "Ufänglech Versiounsnummer" + +#: ../src/interface.c:4364 +msgid "Version number, which a new file initially has" +msgstr "Ufänglech Versiounsnummer vun engem neien Fichier" + +#: ../src/interface.c:4371 +msgid "Company name" +msgstr "Numm vun der Firma" + +#: ../src/interface.c:4373 +msgid "Developer:" +msgstr "Entwéckler:" + +#: ../src/interface.c:4380 +msgid "Company:" +msgstr "Firma:" + +#: ../src/interface.c:4387 +msgid "Mail address:" +msgstr "E-mail Adress:" + +#: ../src/interface.c:4394 +msgid "Initials:" +msgstr "Initialen:" + +#: ../src/interface.c:4406 +msgid "The name of the developer" +msgstr "Den Numm vum Entwéckler" + +#: ../src/interface.c:4408 +msgid "Year:" +msgstr "Joer:" + +#: ../src/interface.c:4415 +msgid "Date:" +msgstr "Datum:" + +#: ../src/interface.c:4422 +msgid "Date & Time:" +msgstr "Datum & Zäit:" + +#: ../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 "" +"Gidd den Datumsformat fir den Specificateur {datetime} an. Dobäi kënnen all " +"déi Specificateuren benotzt ginn déi och an der ANSI C Fonctioun 'strftime' " +"benotzt kënnen ginn." + +#: ../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 "" +"Gidd den Datumsformat fir den Specificateur {year} an. Dobäi kënnen all déi " +"Specificateuren benotzt ginn déi och an der ANSI C Fonctioun 'strftime' " +"benotzt kënnen ginn." + +#: ../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 "" +"Gidd den Datumsformat fir den Specificateur {date} an. Dobäi kënnen all déi " +"Specificateuren benotzt ginn déi och an der ANSI C Fonctioun 'strftime' " +"benotzt kënnen ginn." + +#: ../src/interface.c:4450 +msgid "Template data" +msgstr "Donnéeën vir Virlagen" + +#: ../src/interface.c:4455 +msgid "Templates" +msgstr "Virlagen" + +#: ../src/interface.c:4493 +msgid "C_hange" +msgstr "Ä_nneren" + +#: ../src/interface.c:4497 +msgid "Keyboard shortcuts" +msgstr "Tastatur Kierzel" + +#: ../src/interface.c:4502 +msgid "Keybindings" +msgstr "Kierzel" + +#: ../src/interface.c:4525 +msgid "Command:" +msgstr "Commande:" + +#: ../src/interface.c:4532 +#, 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 +msgid "Use an external command for printing" +msgstr "Eng extern Commande fir ze drécken benotzen" + +#: ../src/interface.c:4562 ../src/printing.c:380 +msgid "Print line numbers" +msgstr "Zeilennummer drécken" + +#: ../src/interface.c:4565 ../src/printing.c:382 +msgid "Add line numbers to the printed page" +msgstr "Mat Zeilennummeren drécken " + +#: ../src/interface.c:4567 ../src/printing.c:385 +msgid "Print page numbers" +msgstr "Säitenzuel drécken" + +#: ../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 "" +"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 +msgid "Print page header" +msgstr "Kappzeil drécken" + +#: ../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 "" +"Eng Kappzeil op all Säit setzen mat der Unzuel un Säiten, den Numm vum " +"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 +msgid "Use the basename of the printed file" +msgstr "Den Basisnumm vum gedréckten Fichier benotzen." + +#: ../src/interface.c:4595 +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 +msgid "Date format:" +msgstr "Format vum Datum:" + +#: ../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 "" +"Gidd en Datumsformat an, den fir d'Kappzeil benotzt gëtt. Dobäi kënnen all " +"déi Specificateuren benotzt ginn déi och an der ANSI C Fonctioun 'strftime' " +"benotzt kënnen ginn." + +#: ../src/interface.c:4611 +msgid "Use native GTK printing" +msgstr "GTK-Dréckënnerstëtzung benotzen" + +#: ../src/interface.c:4617 +msgid "Printing" +msgstr "Drécken" + +#: ../src/interface.c:5040 +msgid "Project Properties" +msgstr "Eegenschaften vum Projet" + +#: ../src/keybindings.c:198 ../src/plugins.c:1099 +msgid "File" +msgstr "Fichier" + +#: ../src/keybindings.c:201 +msgid "New" +msgstr "Nei" + +#: ../src/keybindings.c:203 +msgid "Open" +msgstr "Opmaachen" + +#: ../src/keybindings.c:206 +msgid "Open selected file" +msgstr "Ausgewielten Fichier opmaachen" + +#: ../src/keybindings.c:208 +msgid "Save" +msgstr "Späicheren" + +#: ../src/keybindings.c:210 +msgid "Save as" +msgstr "Späicheren als" + +#: ../src/keybindings.c:212 +msgid "Save all" +msgstr "Alles späicheren" + +#: ../src/keybindings.c:215 +msgid "Print" +msgstr "Drécken" + +#: ../src/keybindings.c:217 +msgid "Close" +msgstr "Zoumaachen" + +#: ../src/keybindings.c:219 +msgid "Close all" +msgstr "Alles zoumaachen" + +#: ../src/keybindings.c:222 +msgid "Reload file" +msgstr "Fichier nei lueden" + +#: ../src/keybindings.c:224 ../src/project.c:495 +msgid "Project" +msgstr "Projet" + +#: ../src/keybindings.c:227 +msgid "Project properties" +msgstr "Eegenschaften vum Projet" + +#: ../src/keybindings.c:232 +msgid "Undo" +msgstr "Réckgängeg" + +#: ../src/keybindings.c:234 +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 +#, 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 +msgid "Scroll to current line" +msgstr "Bei dei aktuell Zeil scrollen" + +#: ../src/keybindings.c:248 +msgid "Scroll up the view by one line" +msgstr "Eng Zeil no uewen scrollen" + +#: ../src/keybindings.c:250 +msgid "Scroll down the view by one line" +msgstr "Eng Zeil no ennen scrollen" + +#: ../src/keybindings.c:253 +msgid "Complete snippet" +msgstr "Code vervollstännegen" + +#: ../src/keybindings.c:255 +msgid "Move cursor in snippet" +msgstr "Mauszeiger am Codestéck beweegen" + +#: ../src/keybindings.c:257 +msgid "Suppress snippet completion" +msgstr "Keng Vervollstännegung vun Code" + +#: ../src/keybindings.c:259 +msgid "Context Action" +msgstr "Kontext Aktioun" + +#: ../src/keybindings.c:261 +msgid "Complete word" +msgstr "Wuert vervollstännegen" + +#: ../src/keybindings.c:263 +msgid "Show calltip" +msgstr "Calltip uweisen" + +#: ../src/keybindings.c:265 +msgid "Show macro list" +msgstr "Lescht mat den Makroen uweisen" + +#: ../src/keybindings.c:267 +msgid "Clipboard" +msgstr "Zwëschenspäicher" + +#: ../src/keybindings.c:270 +msgid "Cut" +msgstr "Ausschneiden" + +#: ../src/keybindings.c:272 +msgid "Copy" +msgstr "Kopéieren" + +#: ../src/keybindings.c:274 +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 +msgid "Select" +msgstr "Auswielen" + +#: ../src/keybindings.c:283 +msgid "Select All" +msgstr "Alles Auswielen" + +#: ../src/keybindings.c:285 +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:289 +msgid "Select current paragraph" +msgstr "Aktuellen Abschnitt auswielen" + +#: ../src/keybindings.c:291 +msgid "Format" +msgstr "Format" + +#: ../src/keybindings.c:295 +msgid "Toggle Case of Selection" +msgstr "Grouss an Klengschreiwen an der Auswiel vertauschen" + +#: ../src/keybindings.c:297 +msgid "Toggle line commentation" +msgstr "Kommentéierung ëmdréinen" + +#: ../src/keybindings.c:300 +msgid "Comment line(s)" +msgstr "Zeil(en) kommentéiren" + +#: ../src/keybindings.c:302 +msgid "Uncomment line(s)" +msgstr "Zeil(en) auskommentéiren" + +#: ../src/keybindings.c:304 +msgid "Increase indent" +msgstr "Méi arécken" + +#: ../src/keybindings.c:307 +msgid "Decrease indent" +msgstr "Manner arécken" + +#: ../src/keybindings.c:310 +msgid "Increase indent by one space" +msgstr "Aréckung ëm een Ofstand vergréisseren" + +#: ../src/keybindings.c:312 +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 +msgid "Send to Custom Command 1" +msgstr "Un d'Benotzerdefinéiert Commande 1 schécken" + +#: ../src/keybindings.c:318 +msgid "Send to Custom Command 2" +msgstr "Un d'Benotzerdefinéiert Commande 2 schécken" + +#: ../src/keybindings.c:320 +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 +msgid "Insert" +msgstr "Afügen" + +#: ../src/keybindings.c:329 +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 +msgid "Settings" +msgstr "Astellungen" + +#: ../src/keybindings.c:340 ../src/toolbar.c:350 +msgid "Search" +msgstr "Sichen" + +#: ../src/keybindings.c:343 ../src/search.c:379 +msgid "Find" +msgstr "Fannen" + +#: ../src/keybindings.c:345 +msgid "Find Next" +msgstr "Nächsten fannen" + +#: ../src/keybindings.c:347 +msgid "Find Previous" +msgstr "Viregen fannen" + +#: ../src/keybindings.c:350 +msgid "Find Next Selection" +msgstr "Déi nächst Auswiel fannen" + +#: ../src/keybindings.c:352 +msgid "Find Previous Selection" +msgstr "Vireg Auswiel fannen" + +#: ../src/keybindings.c:354 ../src/search.c:514 +msgid "Replace" +msgstr "Ersetzen" + +#: ../src/keybindings.c:356 ../src/search.c:686 +msgid "Find in Files" +msgstr "An den Fichieren fannen" + +#: ../src/keybindings.c:359 +msgid "Next Message" +msgstr "Nächsten Message" + +#: ../src/keybindings.c:361 +msgid "Previous Message" +msgstr "Viregen Message" + +#: ../src/keybindings.c:363 +msgid "Find Usage" +msgstr "An allen Dokumenter nosichen" + +#: ../src/keybindings.c:365 +msgid "Find Document Usage" +msgstr "Am Dokument nosichen" + +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "_Make all" + +#: ../src/keybindings.c:369 +msgid "Go to" +msgstr "Goen" + +#: ../src/keybindings.c:372 ../src/toolbar.c:66 +msgid "Navigate back a location" +msgstr "Eng Positioun no vir goen" + +#: ../src/keybindings.c:374 ../src/toolbar.c:67 +msgid "Navigate forward a location" +msgstr "Eng Positioun no hannen goen" + +#: ../src/keybindings.c:379 +msgid "Go to matching brace" +msgstr "Bei déi passend Klamer goen" + +#: ../src/keybindings.c:382 +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 +msgid "Go to Tag Definition" +msgstr "Bei d'Definitioun vum Tag goen" + +#: ../src/keybindings.c:392 +msgid "Go to Tag Declaration" +msgstr "Bei d'Declaratioun vum Tag goen" + +#: ../src/keybindings.c:394 +msgid "Go to Start of Line" +msgstr "Un den Ufank vun der Zeil goen" + +#: ../src/keybindings.c:396 +msgid "Go to End of Line" +msgstr "Un den Enn vun der Zeil goen" + +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Un den Enn vun der Zeil goen" + +#: ../src/keybindings.c:400 +msgid "Go to Previous Word Part" +msgstr "Bei dat Deelwuert vun virdrun goen" + +#: ../src/keybindings.c:402 +msgid "Go to Next Word Part" +msgstr "Bei dat nächst Deelwuert goen" + +#: ../src/keybindings.c:404 +msgid "View" +msgstr "Usicht" + +#: ../src/keybindings.c:407 +msgid "Toggle All Additional Widgets" +msgstr "Zousätzlech Infofënstern an/ausblennen" + +#: ../src/keybindings.c:410 +msgid "Fullscreen" +msgstr "Vollbildschierm" + +#: ../src/keybindings.c:412 +msgid "Toggle Messages Window" +msgstr "Noriichtenfënster verstoppen" + +#: ../src/keybindings.c:415 +msgid "Toggle Sidebar" +msgstr "Saitenleescht un an ausschalten" + +#: ../src/keybindings.c:417 +msgid "Zoom In" +msgstr "Eran zoomen" + +#: ../src/keybindings.c:419 +msgid "Zoom Out" +msgstr "Eraus zoomen" + +#: ../src/keybindings.c:421 +msgid "Focus" +msgstr "Fokusséiren" + +#: ../src/keybindings.c:424 +msgid "Switch to Editor" +msgstr "Zum Editor wiesselen" + +#: ../src/keybindings.c:426 +msgid "Switch to Scribble" +msgstr "An den Notizblock wiesselen" + +#: ../src/keybindings.c:428 +msgid "Switch to VTE" +msgstr "An den VTE wiesselen" + +#: ../src/keybindings.c:430 +msgid "Switch to Search Bar" +msgstr "An d'Sichfënster wiesselen" + +#: ../src/keybindings.c:432 +msgid "Switch to Sidebar" +msgstr "An d'Saitenleescht wiesselen" + +#: ../src/keybindings.c:434 +msgid "Switch to Compiler" +msgstr "Zum Compiler wiesselen" + +#: ../src/keybindings.c:436 +msgid "Notebook tab" +msgstr "Tab" + +#: ../src/keybindings.c:439 +msgid "Switch to left document" +msgstr "Zum lenken Dokument wiesselen" + +#: ../src/keybindings.c:441 +msgid "Switch to right document" +msgstr "Zum rietsen Dokument wiesselen" + +#: ../src/keybindings.c:443 +msgid "Switch to last used document" +msgstr "Zum läscht benotzten Dokument wiesselen" + +#: ../src/keybindings.c:445 +msgid "Move document left" +msgstr "Dokument no lenks beweegen" + +#: ../src/keybindings.c:447 +msgid "Move document right" +msgstr "Dokument no riets beweegen" + +#: ../src/keybindings.c:449 +msgid "Move document first" +msgstr "Dokument un den Ufank beweegen" + +#: ../src/keybindings.c:451 +msgid "Move document last" +msgstr "Dokument un den Schluss beweegen" + +#: ../src/keybindings.c:453 +msgid "Document" +msgstr "Dokument" + +#: ../src/keybindings.c:456 +msgid "Toggle Line wrapping" +msgstr "Visuellen Zeilenembroch emschalten" + +#: ../src/keybindings.c:458 +msgid "Toggle Line breaking" +msgstr "Automateschen Zeilenembroch emschalten" + +#: ../src/keybindings.c:462 +msgid "Replace spaces by tabs" +msgstr "Ofstänn duerch Tabulatoren ersetzen" + +#: ../src/keybindings.c:464 +msgid "Toggle current fold" +msgstr "Aktuell Fal emdréinen" + +#: ../src/keybindings.c:466 +msgid "Fold all" +msgstr "Zesummeklappen" + +#: ../src/keybindings.c:468 +msgid "Unfold all" +msgstr "Erausklappen" + +#: ../src/keybindings.c:470 +msgid "Reload symbol list" +msgstr "Lescht mat den Symboler nei lueden" + +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +msgid "Build" +msgstr "Erstellen" + +#: ../src/keybindings.c:475 ../src/toolbar.c:68 +msgid "Compile" +msgstr "Compiléieren" + +#: ../src/keybindings.c:479 +msgid "Make all" +msgstr "Make all" + +#: ../src/keybindings.c:482 +msgid "Make custom target" +msgstr "Make mat eegenem Ziel" + +#: ../src/keybindings.c:484 +msgid "Make object" +msgstr "Make object" + +#: ../src/keybindings.c:486 +msgid "Next error" +msgstr "Nächsten Feeler" + +#: ../src/keybindings.c:488 +msgid "Previous error" +msgstr "Viregen Feeler" + +#: ../src/keybindings.c:490 +msgid "Run" +msgstr "Ausféiren" + +#: ../src/keybindings.c:492 +msgid "Run (alternative command)" +msgstr "Ausféieren (alternativ Commande):" + +#: ../src/keybindings.c:494 +msgid "Build options" +msgstr "Optiounen fir d'Erstellung" + +#: ../src/keybindings.c:499 +msgid "Show Color Chooser" +msgstr "Faarwe Auswieler uweisen" + +#: ../src/keybindings.c:501 ../src/keybindings.c:504 +msgid "Help" +msgstr "Hëllef" + +#: ../src/keybindings.c:799 +msgid "Keyboard Shortcuts" +msgstr "Tastatur Kierzel" + +#: ../src/keybindings.c:812 +msgid "The following keyboard shortcuts are configurable:" +msgstr "Déi folgend Kierzel kënnen agestallt ginn:" + +#: ../src/keybindings.c:1583 +msgid "Switch to Document" +msgstr "Zum Dokument wiesselen" + +#: ../src/keyfile.c:811 +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 +msgid "Failed to load one or more session files." +msgstr "Konnt verschidden Sëtzungsfichieren net lueden." + +#: ../src/log.c:181 +msgid "Debug Messages" +msgstr "Debug Messagen" + +#: ../src/main.c:124 +msgid "" +"Set initial column number for the first opened file (useful in conjunction " +"with --line)" +msgstr "" +"Setzt Kolonnennummer am fir d'éischt opgematen Fichier. Sënnvoll nëmmen an " +"Kombinatioun mat der Optioun -l oder --line" + +#: ../src/main.c:125 +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 +msgid "Print internal filetype names" +msgstr "Weist déi ënnerstëtzen Fichierstypen un" + +#: ../src/main.c:128 +msgid "Generate global tags file (see documentation)" +msgstr "Globalen Tag Fichier erstellen (Dokumentatioun beuechten)" + +#: ../src/main.c:129 +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 +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 +msgid "Set initial line number for the first opened file" +msgstr "Setzt d'Zeilennummer am fir d'éischt opgematen Fichier" + +#: ../src/main.c:135 +msgid "Don't show message window at startup" +msgstr "D'Noriichtenfënster beim Start net uweisen" + +#: ../src/main.c:136 +msgid "Don't load auto completion data (see documentation)" +msgstr "" +"Automatesch Vervollstännegungsdonnéeen net lueden (Dokumentatioun beuechten)" + +#: ../src/main.c:138 +msgid "Don't load plugins" +msgstr "Keng PlugIns lueden" + +#: ../src/main.c:140 +msgid "Print Geany's installation prefix" +msgstr "Den Installatiounsordner vun Geany ausginn" + +#: ../src/main.c:141 +msgid "Don't load the previous session's files" +msgstr "Fichieren aus der Sëtzung vun virdrun net lueden" + +#: ../src/main.c:143 +msgid "Don't load terminal support" +msgstr "Keng Ënnerstëtzung fir den Terminal lueden" + +#: ../src/main.c:144 +msgid "Filename of libvte.so" +msgstr "Den Numm vum Fichier libvte.so" + +#: ../src/main.c:147 +msgid "Show version and exit" +msgstr "Versioun uweisen an nees erausgoen" + +#: ../src/main.c:470 +msgid "[FILES...]" +msgstr "[FICHIEREN...]" + +#: ../src/main.c:487 +#, 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 +msgid "Move it now?" +msgstr "Elo Beweegen?" + +#: ../src/main.c:594 +msgid "Geany needs to move your old configuration directory before starting." +msgstr "Geany muss ären aalen Configuratiounsordner virum Start beweegen." + +#: ../src/main.c:603 +#, c-format +msgid "" +"Your configuration directory has been successfully moved from \"%s\" to \"%s" +"\"." +msgstr "Ären Configuratiounsordner as vun \"%s\" no \"%s\" beweegt ginn." + +#. 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 "" +"Ären aalen Configuratiounsordner \"%s\" konnt nët no \"%s\" beweegt ginn (%" +"s). Beweegt den Ordner w.e.g. manuell." + +#: ../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 "" +"Den Cofiguratiounsordner konnt net erstallt ginn (%s).\n" +"Et kinnten Problemer optrieden, wan Geany ouni Configuratiounsordner benotzt " +"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 +#, c-format +msgid "This is Geany %s." +msgstr "Dëst as Geany '%s'." + +#: ../src/main.c:992 +#, c-format +msgid "Configuration directory could not be created (%s)." +msgstr "Den Cofiguratiounsordner konnt net erstallt ginn (%s)." + +#: ../src/main.c:1224 +msgid "Configuration files reloaded." +msgstr "Fichier mat den Configuratiounen nei gelueden." + +#: ../src/msgwindow.c:135 +msgid "Status messages" +msgstr "Status Messagen" + +#: ../src/msgwindow.c:515 +msgid "Copy _All" +msgstr "_Alles kopeiren" + +#: ../src/msgwindow.c:545 +msgid "_Hide Message Window" +msgstr "Noriic_htenfënster verstoppen" + +#: ../src/plugins.c:425 +#, c-format +msgid "" +"The plugin \"%s\" is not binary compatible with this release of Geany - " +"please recompile it." +msgstr "" +"Den PlugIn \"%s\" ass net compatibel mat dëser Versioun vun Geany - dier " +"musst en nei compiléieren." + +#: ../src/plugins.c:869 +msgid "_Plugin Manager" +msgstr "_PlugIn Manager" + +#: ../src/plugins.c:1017 +#, c-format +msgid "" +"Plugin: %s %s\n" +"Description: %s\n" +"Author(s): %s" +msgstr "" +"PlugIn: %s %s\n" +"Beschreiwung: %s\n" +"Auteur(en): %s" + +#: ../src/plugins.c:1087 +msgid "Active" +msgstr "Aktiv" + +#: ../src/plugins.c:1093 +msgid "Plugin" +msgstr "Plugin" + +#: ../src/plugins.c:1117 +msgid "No plugins available." +msgstr "Keng PlugIns verfügbar" + +#: ../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 "" +"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 +msgid "Plugin details:" +msgstr "Detailer vum PlugIn" + +#: ../src/prefs.c:160 +msgid "Grab Key" +msgstr "Knäppchen drécken" + +#: ../src/prefs.c:166 +#, 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 +msgid "_Expand All" +msgstr "Alles _erausklappen" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "Alles eran_klappen" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Aktioun" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Ofkierzung" + +#: ../src/prefs.c:1398 +msgid "_Override" +msgstr "I_wwerschreiwen" + +#: ../src/prefs.c:1399 +msgid "Override that keybinding?" +msgstr "Den Kierzel iwwerschreiwen?" + +#: ../src/prefs.c:1400 +#, c-format +msgid "The combination '%s' is already used for \"%s\"." +msgstr "Den Kierzel '%s' gëtt schonns fir \"%s\" benotzt." + +#. 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 "" +"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 +msgid "" +"Set the information to be used in templates. See the documentation for " +"details." +msgstr "" +"D'Informatiounen astellen déi an den Virlagen soll benotzt ginn. Kuckt an " +"d'Dokumentatioun fir méi Detailer." + +#: ../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 "" +"Fir dass déi hei gematen Ännerungen an en Astellungen wierksam ginn muss " +"Geany nei gestart ginn oder dier musst \"Geschir->Astellungen nei lueden\" " +"opruffen" + +#. 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 "" +"Hei kënnt dier d'Tastenkierzel vir verschidden Aktiounen änneren. Wielt eng " +"eraus an dréckt op. Änneren fir den neien Kierzel anzeginn oder klickt " +"zweemol op eng Aktioun fir den Kierzel direkt ze änneren." + +#. 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 "" +"GTK-Dréckënnerstëtzung ass nëmmen dann verfügbar wann Geany mat GTK 2.10 " +"(oder méi héich) compiléiert gouf an Geany mat GTK 2.10 (oder méi " +"heich) ausgefouert gëtt." + +#. page Editor->Indentation +#: ../src/prefs.c:1540 +msgid "" +"Warning: these settings are overridden by the current project. See " +"Project->Properties." +msgstr "" +"Warnung: Dës Astellungen ginn iwwerschriwwen duerch déi vum aktuellen " +"Projet. Kuckt ënnert Projet->Astellungen." + +#: ../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 "Sait %d vun %d" + +#: ../src/printing.c:375 +msgid "Document Setup" +msgstr "Dokument ariichten" + +#: ../src/printing.c:410 +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 +#, c-format +msgid "Page %d of %d" +msgstr "Säit %d vun %d" + +#: ../src/printing.c:776 +#, c-format +msgid "Printing of file %s was cancelled." +msgstr "Drécken vum Fichier %s gouf ofgebrach." + +#: ../src/printing.c:778 ../src/printing.c:897 +#, c-format +msgid "File %s printed." +msgstr "Den Fichier %s gouf gedréckt" + +#: ../src/printing.c:827 +#, c-format +msgid "Printing of %s failed (%s)." +msgstr "Den Fichier %s konnt net gedréckt gin (%s)" + +#: ../src/printing.c:867 +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 +#, c-format +msgid "" +"The file \"%s\" will be printed with the following command:\n" +"\n" +"%s" +msgstr "" +"Den Fichier \"%s\" gëtt mat den folgenden Commanden gedréckt:\n" +"\n" +"%s" + +#: ../src/printing.c:891 +#, c-format +msgid "Printing of \"%s\" failed (return code: %s)." +msgstr "Den Fichier %s konnt net gedréckt gin (Code: %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 "Projeten" + +#: ../src/project.c:118 +msgid "New Project" +msgstr "Neie Projet" + +#: ../src/project.c:126 +msgid "C_reate" +msgstr "E_rstellen" + +#: ../src/project.c:140 ../src/project.c:386 +msgid "Name:" +msgstr "Numm:" + +#: ../src/project.c:149 ../src/project.c:399 +msgid "Filename:" +msgstr "Numm vum Fichier:" + +#: ../src/project.c:165 ../src/project.c:429 +msgid "Base path:" +msgstr "Basis Pad:" + +#: ../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 "" +"Basisordner an dem all d'Fichieren vum Projet leien. Dier kënnt en Ordner " +"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 +msgid "Choose Project Base Path" +msgstr "Den basis Pad vum Projet wielen" + +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 +#, 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 +msgid "Open Project" +msgstr "Projet Opmaachen" + +#: ../src/project.c:296 +msgid "Project files" +msgstr "Fichieren vum Projet" + +#: ../src/project.c:330 +#, c-format +msgid "Project \"%s\" closed." +msgstr "Projet \"%s\" gouf zougemaach" + +#: ../src/project.c:412 +msgid "Description:" +msgstr "Beschreiwung:" + +#: ../src/project.c:447 +msgid "Make in base path" +msgstr "Make am basis Pad" + +#: ../src/project.c:452 +msgid "Run command:" +msgstr "Commande ausféieren:" + +#: ../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 "" +"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 +msgid "File patterns:" +msgstr "Muster vum Fichiersnumm:" + +#: ../src/project.c:578 +msgid "Do you want to close it before proceeding?" +msgstr "Wëllt dier et zoumaachen virum weiderfueren?" + +#: ../src/project.c:579 +#, c-format +msgid "The '%s' project is already open." +msgstr "Den Projet '%s' ass schonns op" + +#: ../src/project.c:623 +msgid "The specified project name is too short." +msgstr "Den Numm fir den Projet ass ze kuerz" + +#: ../src/project.c:629 +#, 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 +msgid "You have specified an invalid project filename." +msgstr "Dier hutt en schlechten Numm fir den Projetsfichier uginn." + +#: ../src/project.c:660 +msgid "Create the project's base path directory?" +msgstr "Soll den Projetsbasisordner erstallt ginn?" + +#: ../src/project.c:661 +#, c-format +msgid "The path \"%s\" does not exist." +msgstr "Den Pad \"%s\" existéiert net." + +#: ../src/project.c:670 +#, c-format +msgid "Project base directory could not be created (%s)." +msgstr "Den Projetsordner konnt net erstallt ginn (%s)." + +#: ../src/project.c:682 +#, c-format +msgid "Project file could not be written (%s)." +msgstr "Projetsfichier konnt net geschriwwen ginn (%s)." + +#: ../src/project.c:730 +#, c-format +msgid "Project \"%s\" created." +msgstr "Projet \"%s\" erstallt." + +#: ../src/project.c:732 +#, c-format +msgid "Project \"%s\" saved." +msgstr "Den Projet \"%s\" gouf gespäichert." + +#. initialise the dialog +#: ../src/project.c:798 ../src/project.c:809 +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 +#, c-format +msgid "Project \"%s\" opened." +msgstr "Den Projet \"%s\" ass op." + +#: ../src/search.c:216 +msgid "_Use regular expressions" +msgstr "Reg_ulär Ausdréck benotzen" + +#: ../src/search.c:220 +msgid "" +"Use POSIX-like regular expressions. For detailed information about using " +"regular expressions, please read the documentation." +msgstr "" +"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 +msgid "Search _backwards" +msgstr "_Hannerzeg sichen" + +#: ../src/search.c:241 +msgid "Use _escape sequences" +msgstr "_Escape Sequenzen benotzen" + +#: ../src/search.c:246 +msgid "" +"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " +"corresponding control characters" +msgstr "" +"Ersetzt \\\\, \\t, \\n, \\r an \\uXXXX (Unicode Zeechen) duerch déi " +"entspriechend Zeechen" + +#: ../src/search.c:255 ../src/search.c:781 +msgid "C_ase sensitive" +msgstr "Grouss _an Klengschreiwung ënnerscheeden" + +#: ../src/search.c:260 ../src/search.c:787 +msgid "Match only a _whole word" +msgstr "Nëmmen ganz _Wierder fannen" + +#: ../src/search.c:265 +msgid "Match from s_tart of word" +msgstr "Wuert_ufank fannen" + +#: ../src/search.c:386 +msgid "_Previous" +msgstr "V_ireg" + +#: ../src/search.c:392 +msgid "_Next" +msgstr "_Nächsten" + +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +msgid "_Search for:" +msgstr "_Sichen:" + +#. Now add the multiple match options +#: ../src/search.c:424 +msgid "_Find All" +msgstr "Alles _fannen" + +#: ../src/search.c:431 +msgid "_Mark" +msgstr "_Markéieren" + +#: ../src/search.c:433 +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 +msgid "In Sessi_on" +msgstr "An der Sët_zung" + +#: ../src/search.c:443 ../src/search.c:600 +msgid "_In Document" +msgstr "Am _Dokument" + +#. close window checkbox +#: ../src/search.c:449 ../src/search.c:613 +msgid "Close _dialog" +msgstr "_Dialog zoumaachen" + +#: ../src/search.c:454 ../src/search.c:618 +msgid "Disable this option to keep the dialog open" +msgstr "Dës Optioun deaktivéieren fir den Dialog net zouzemaachen" + +#: ../src/search.c:529 +msgid "Replace & Fi_nd" +msgstr "Ersetzen & Fa_nnen" + +#: ../src/search.c:538 +msgid "Replace wit_h:" +msgstr "Ersetzen duerc_h:" + +#. Now add the multiple replace options +#: ../src/search.c:588 +msgid "Re_place All" +msgstr "A_lleguer ersetzen" + +#: ../src/search.c:605 +msgid "In Se_lection" +msgstr "An der Sé_lectioun" + +#: ../src/search.c:607 +msgid "Replace all matches found in the currently selected text" +msgstr "All Iwwerteneestëmmungen am momentan ausgewielten Text ersetzen" + +#: ../src/search.c:696 +msgid "_Directory:" +msgstr "Or_dner:" + +#: ../src/search.c:727 +msgid "E_ncoding:" +msgstr "E_ncodage:" + +#: ../src/search.c:752 +msgid "Fixed s_trings" +msgstr "Fes_t Zeechenketten" + +#: ../src/search.c:761 +msgid "_Grep regular expressions" +msgstr "_Grep regulär Ausdréck" + +#: ../src/search.c:764 ../src/search.c:772 +msgid "See grep's manual page for more information" +msgstr "Consultéiert d'grep Benotzerhandbuch fir weider Informatiounen" + +#: ../src/search.c:769 +msgid "_Extended regular expressions" +msgstr "_Erweidert regulär Ausdréck benotzen" + +#: ../src/search.c:776 +msgid "_Recurse in subfolders" +msgstr "_An den Ënnerordneren" + +#: ../src/search.c:792 +msgid "_Invert search results" +msgstr "S_ichmuster emdreinen." + +#: ../src/search.c:797 +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 +msgid "E_xtra options:" +msgstr "E_xtra Optiounen:" + +#: ../src/search.c:822 +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 +#, 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:1304 +msgid "Invalid directory for find in files." +msgstr "Ongültegen Ordner" + +#: ../src/search.c:1324 +msgid "No text to find." +msgstr "Keen Text fir ze fannen." + +#: ../src/search.c:1351 +#, 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 +msgid "Searching..." +msgstr "Am gaang ze sichen..." + +#: ../src/search.c:1431 +#, c-format +msgid "%s %s -- %s (in directory: %s)" +msgstr "%s %s -- %s (am Ordner: %s)" + +#: ../src/search.c:1459 +#, 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:1586 +#, 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 +msgid "No matches found." +msgstr "Keng Iwwerteneestëmmungen fonnt." + +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 +msgid "Chapter" +msgstr "Kapitel" + +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 +msgid "Section" +msgstr "Sectioun" + +#: ../src/symbols.c:598 +msgid "Sect1" +msgstr "Sect1" + +#: ../src/symbols.c:599 +msgid "Sect2" +msgstr "Sect2" + +#: ../src/symbols.c:600 +msgid "Sect3" +msgstr "Sect3" + +#: ../src/symbols.c:601 +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 +msgid "Other" +msgstr "Anerer" + +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 +msgid "Module" +msgstr "Modul" + +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 +msgid "Types" +msgstr "Typen" + +#: ../src/symbols.c:611 +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 +msgid "Functions" +msgstr "Fonctiounen" + +#: ../src/symbols.c:617 ../src/symbols.c:623 +msgid "Sections" +msgstr "Sectiounen" + +#: ../src/symbols.c:618 +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 +msgid "Variables" +msgstr "Variabelen" + +#: ../src/symbols.c:631 +msgid "Command" +msgstr "Commande" + +#: ../src/symbols.c:632 +msgid "Environment" +msgstr "Environnement" + +#: ../src/symbols.c:634 ../src/symbols.c:702 +msgid "Subsection" +msgstr "Ënner-sectioun" + +#: ../src/symbols.c:635 ../src/symbols.c:703 +msgid "Subsubsection" +msgstr "Ënner-ënner-sectioun" + +#: ../src/symbols.c:636 +msgid "Label" +msgstr "Label" + +#: ../src/symbols.c:646 +msgid "Structures" +msgstr "Strukturen" + +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 +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:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 +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 +msgid "Classes" +msgstr "Klassen" + +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 +msgid "Constants" +msgstr "Konstanten" + +#: ../src/symbols.c:682 +msgid "Anchors" +msgstr "Ankeren" + +#: ../src/symbols.c:683 +msgid "H1 Headings" +msgstr "H1 Iwwerschrëft" + +#: ../src/symbols.c:684 +msgid "H2 Headings" +msgstr "H2 Iwwerschrëft" + +#: ../src/symbols.c:685 +msgid "H3 Headings" +msgstr "H3 Iwwerschrëft" + +#: ../src/symbols.c:693 +msgid "ID Selectors" +msgstr "ID" + +#: ../src/symbols.c:694 +msgid "Type Selectors" +msgstr "Typ" + +#: ../src/symbols.c:710 +msgid "Modules" +msgstr "Moduler" + +#: ../src/symbols.c:712 +msgid "Singletons" +msgstr "Singletons" + +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 +msgid "Methods" +msgstr "Methoden" + +#: ../src/symbols.c:722 ../src/symbols.c:850 +#, fuzzy +msgid "Namespaces" +msgstr "Namespaces" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Eegenschaften" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Exportéiren" + +#: ../src/symbols.c:766 ../src/symbols.c:855 +msgid "Members" +msgstr "Memberen" + +#: ../src/symbols.c:806 ../src/symbols.c:829 +msgid "Labels" +msgstr "Label" + +#: ../src/symbols.c:818 +msgid "Subroutines" +msgstr "Subroutinen" + +#: ../src/symbols.c:821 +msgid "Blocks" +msgstr "Bléck" + +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 +msgid "Macros" +msgstr "Makroen" + +#: ../src/symbols.c:831 +msgid "Defines" +msgstr "Definitiounen" + +#: ../src/symbols.c:838 +msgid "Targets" +msgstr "Zieler" + +#: ../src/symbols.c:856 +msgid "Structs" +msgstr "Strukturen" + +#: ../src/symbols.c:857 +msgid "Typedefs / Enums" +msgstr "Typdefinitiounen / Enumeratiounen" + +#: ../src/symbols.c:1337 +#, c-format +msgid "Unknown filetype extension for \"%s\".\n" +msgstr "Onbekannten Fichierstyp Endung fir \"%s\".\n" + +#: ../src/symbols.c:1358 +#, 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 +#, c-format +msgid "" +"Usage: %s -g \n" +"\n" +msgstr "" +"Benotzung: %s -g \n" +"\n" + +#: ../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 "" +"Beispill:\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 +msgid "Load Tags" +msgstr "Tags lueden" + +#: ../src/symbols.c:1387 +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 +#, c-format +msgid "Loaded %s tags file '%s'." +msgstr "%s Tag Fichier '%s' gelueden." + +#: ../src/symbols.c:1409 +#, c-format +msgid "Could not load tags file '%s'." +msgstr "Konnt den Tag Fichier '%s' net lueden." + +#: ../src/symbols.c:1555 +#, c-format +msgid "Forward declaration \"%s\" not found." +msgstr "Vijenzeg Deklaratioun vun \"%s\" net fonnt." + +#: ../src/symbols.c:1557 +#, c-format +msgid "Definition of \"%s\" not found." +msgstr "Definitioun vun \"%s\" konnt net fonnt ginn." + +#: ../src/symbols.c:1863 +msgid "Sort by _Name" +msgstr "No _Numm sënneren" + +#: ../src/symbols.c:1870 +msgid "Sort by _Appearance" +msgstr "No _Optrieden sënneren" + +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 +msgid "Save the current file" +msgstr "Den aktuellen Fichier späicheren" + +#: ../src/toolbar.c:56 +msgid "Save all open files" +msgstr "All oppen Fichieren späicheren" + +#: ../src/toolbar.c:57 +msgid "Reload the current file from disk" +msgstr "Den aktuellen Fichier nei lueden" + +#: ../src/toolbar.c:58 +msgid "Close the current file" +msgstr "Aktuellen Fichier zoumaachen" + +#: ../src/toolbar.c:59 +msgid "Close all open files" +msgstr "All oppen Fichieren zoumaachen" + +#: ../src/toolbar.c:60 +msgid "Cut the current selection" +msgstr "Aktuell Sélectioun erausschneiden" + +#: ../src/toolbar.c:61 +msgid "Copy the current selection" +msgstr "Aktuell Sélectioun kopéieren" + +#: ../src/toolbar.c:62 +msgid "Paste the contents of the clipboard" +msgstr "Inhalt aus dem Zwëschenspäicher afügen" + +#: ../src/toolbar.c:63 +msgid "Delete the current selection" +msgstr "Aktuell Auswiel läschen" + +#: ../src/toolbar.c:64 +msgid "Undo the last modification" +msgstr "Läscht Ännerung réckgängeg maachen" + +#: ../src/toolbar.c:65 +msgid "Redo the last modification" +msgstr "Läscht Ännerung widderhuelen" + +#: ../src/toolbar.c:68 +msgid "Compile the current file" +msgstr "Den aktuellen Fichier compiléieren" + +#: ../src/toolbar.c:69 +msgid "Run or view the current file" +msgstr "Aktuellen Fichier ausféieren oder betruechten" + +#: ../src/toolbar.c:70 +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 +msgid "Zoom in the text" +msgstr "An den Text eranzoomen" + +#: ../src/toolbar.c:72 +msgid "Zoom out the text" +msgstr "Aus dem Text erauszoomen" + +#: ../src/toolbar.c:73 +msgid "Decrease indentation" +msgstr "Manner arécken" + +#: ../src/toolbar.c:74 +msgid "Increase indentation" +msgstr "Méi arécken" + +#: ../src/toolbar.c:75 ../src/toolbar.c:350 +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 +msgid "Jump to the entered line number" +msgstr "Bei dei agetippten Zeilennummer goen" + +#: ../src/toolbar.c:77 +msgid "Show the preferences dialog" +msgstr "Den Dialog mat den Astellungen uweisen" + +#: ../src/toolbar.c:78 +msgid "Quit Geany" +msgstr "Geany verloossen" + +#: ../src/toolbar.c:79 +msgid "Print document" +msgstr "Dokument drécken" + +#: ../src/toolbar.c:80 +#, 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 +msgid "Create a new file" +msgstr "En neien Fichier erstellen" + +#: ../src/toolbar.c:339 +msgid "Open an existing file" +msgstr "En Fichier opmaachen" + +#: ../src/toolbar.c:358 +msgid "Goto" +msgstr "Goen" + +#: ../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 "Uweisen" + +#: ../src/tools.c:153 +#, c-format +msgid "" +"The executed custom command returned an error. Your selection was not " +"changed. Error message: %s" +msgstr "" +"Dei ausgefouert benotzerdefinéiert Commande huet eng Feelermeldung erëmginn " +"D'Auswiel gouf net geännert. Feelermeldung: %s" + +#: ../src/tools.c:219 +msgid "The executed custom command exited with an unsuccessful exit code." +msgstr "Déi benotzerdefinéiert Commande huet mat engem Feeler opgehaalen." + +#: ../src/tools.c:246 +#, c-format +msgid "Passing data and executing custom command: %s" +msgstr "" +"Donnéeën ginn weidergeleet an déi benotzerdefinéiert Commande '%s' gëtt " +"ausgefouert." + +#: ../src/tools.c:290 +#, c-format +msgid "Custom command failed: %s" +msgstr "Benotzerdefinéiert Commande feelgeschloen: %s" + +#: ../src/tools.c:304 ../src/tools.c:538 +msgid "Set Custom Commands" +msgstr "Benotzerdefinéiert Commanden setzen" + +#: ../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 "" +"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 +msgid "No custom commands defined." +msgstr "Keng Benotzerdefinéiert Commanden definéiert." + +#: ../src/tools.c:615 +msgid "Word Count" +msgstr "Wierder zielen" + +#: ../src/tools.c:625 +msgid "selection" +msgstr "Sélectioun" + +#: ../src/tools.c:631 +msgid "whole document" +msgstr "ganzt Dokument" + +#: ../src/tools.c:640 +msgid "Range:" +msgstr "Beräich:" + +#: ../src/tools.c:652 +msgid "Lines:" +msgstr "Zeilen:" + +#: ../src/tools.c:666 +msgid "Words:" +msgstr "Wierder:" + +#: ../src/tools.c:680 +msgid "Characters:" +msgstr "Buschtawen:" + +#: ../src/treeviews.c:177 +msgid "No tags found" +msgstr "Keng Tags fonnt." + +#: ../src/treeviews.c:508 +msgid "Show S_ymbol List" +msgstr "Lescht mat den S_ymboler uweisen" + +#: ../src/treeviews.c:516 +msgid "Show _Document List" +msgstr "Lescht mat den _Dokumenter uweisen" + +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +msgid "H_ide Sidebar" +msgstr "Sa_itenleescht verstoppen" + +#: ../src/treeviews.c:591 +#, 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 " +msgstr "Zeil: %d\t Kol.: %d\t Sél.: %d\t" + +#. RO = read-only +#: ../src/ui_utils.c:194 +msgid "RO " +msgstr "RO" + +#. OVR = overwrite/overtype, INS = insert +#: ../src/ui_utils.c:196 +msgid "OVR" +msgstr "OVR" + +#: ../src/ui_utils.c:196 +msgid "INS" +msgstr "INS" + +#: ../src/ui_utils.c:202 +msgid "TAB" +msgstr "Tabulator" + +#: ../src/ui_utils.c:205 +msgid "SP" +msgstr "Ofstand" + +#: ../src/ui_utils.c:208 +msgid "T/S" +msgstr "T/S" + +#: ../src/ui_utils.c:212 +#, c-format +msgid "mode: %s" +msgstr "Modus: %s" + +#: ../src/ui_utils.c:215 +#, c-format +msgid "encoding: %s %s" +msgstr "Zeechencodéierung: %s %s" + +#: ../src/ui_utils.c:221 +#, c-format +msgid "filetype: %s" +msgstr "Typ vum Fichier: %s" + +#: ../src/ui_utils.c:225 +msgid "MOD" +msgstr "MOD" + +#: ../src/ui_utils.c:230 +#, c-format +msgid "scope: %s" +msgstr "Beräich: %s" + +#: ../src/ui_utils.c:315 +#, c-format +msgid "Font updated (%s)." +msgstr "Schrëft gewiesselt (%s)." + +#: ../src/ui_utils.c:511 +msgid "C Standard Library" +msgstr "C Standard Bibliothéik" + +#: ../src/ui_utils.c:512 +msgid "ISO C99" +msgstr "ISO C99" + +#: ../src/ui_utils.c:513 +msgid "C++ (C Standard Library)" +msgstr "C++ (C Standard Bibliothéik)" + +#: ../src/ui_utils.c:514 +msgid "C++ Standard Library" +msgstr "C++ Standard Bibliothéik" + +#: ../src/ui_utils.c:515 +msgid "C++ STL" +msgstr "C++ STL" + +#: ../src/ui_utils.c:579 +msgid "_Set Custom Date Format" +msgstr "Benotzerdefinéierten Format fir den Datum _setzen" + +#: ../src/ui_utils.c:1644 +msgid "Select Folder" +msgstr "Ordner wielen" + +#: ../src/ui_utils.c:1644 +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 +msgid "Save All" +msgstr "Alles späicheren" + +#: ../src/ui_utils.c:1786 +msgid "Close All" +msgstr "Alles zoumaachen" + +#: ../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 "Terminal" + +#: ../src/vte.c:548 +msgid "_Set Path From Document" +msgstr "Den Pad vum Dokument au_s definéieren." + +#: ../src/vte.c:553 +msgid "_Restart Terminal" +msgstr "Terminal nei sta_rten" + +#: ../src/vte.c:576 +#, fuzzy +msgid "_Input Methods" +msgstr "Methoden fir anzeg_inn" + +#: ../src/vte.c:670 +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." +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 +msgid "Sets the font for the terminal widget" +msgstr "D'Schrëft fir den Terminal astellen" + +#: ../src/vte.c:752 +msgid "Foreground color:" +msgstr "Virdergrondfaarf:" + +#: ../src/vte.c:758 +msgid "Background color:" +msgstr "Hannergrondfaarf:" + +#: ../src/vte.c:768 +msgid "Sets the foreground color of the text in the terminal widget" +msgstr "Virdergrondfaarf vum Text am Terminal astellen" + +#: ../src/vte.c:775 +msgid "Sets the background color of the text in the terminal widget" +msgstr "Hannergrondfaarf vum Text am Terminal astellen" + +#: ../src/vte.c:778 +msgid "Scrollback lines:" +msgstr "Zeilen zeréckscrollen" + +#: ../src/vte.c:790 +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 +msgid "Shell:" +msgstr "Shell:" + +#: ../src/vte.c:802 +msgid "" +"Sets the path to the shell which should be started inside the terminal " +"emulation" +msgstr "" +"Den Pad vun der Shell astellen déi innerhalb der Terminal emulatioun gestart " +"soll ginn" + +#: ../src/vte.c:819 +msgid "Scroll on keystroke" +msgstr "Bei Tastendrock scrollen" + +#: ../src/vte.c:820 +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 +msgid "Scroll on output" +msgstr "Bei enger Ausgab scrollen" + +#: ../src/vte.c:824 +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 +msgid "Cursor blinks" +msgstr "Curseur blénkt" + +#: ../src/vte.c:828 +msgid "Whether to blink the cursor" +msgstr "Ob den Curseur blénken soll" + +#: ../src/vte.c:831 +msgid "Override Geany keybindings" +msgstr "Tastenkierzel vun Geany iwwerschreiwen" + +#: ../src/vte.c:833 +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 +msgid "Disable menu shortcut key (F10 by default)" +msgstr "Menüskierzel deaktivéiren (standardméisseg 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 "" +"Dës Optioun deaktivéiert den Kierzel fir d'Menüsleescht unzeweisen " +"(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 +msgid "Follow the path of the current file" +msgstr "Dem Pad vum aktuellen Fichier nogoen" + +#: ../src/vte.c:841 +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 " +"gewiesselt gëtt" + +#. 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 "Run-Skript net benotzen" + +#: ../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 "" +"Den Run-Skript, den normalerweis benotzt gëtt fir den Status vun " +"ausgefouerten Programmer zeréckzeginn, net benotzen" + +#: ../src/vte.c:850 +msgid "Execute programs in VTE" +msgstr "Programmer am VTE ausféieren" + +#: ../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 "" +"Programmer an der VTE ausféieren aplaz eng nei Terminalfënster opzemaachen. " +"Opgepasst: Programmer an déi an der VTE ausgefouert ginn, kënnen net " +"gestoppt ginn." + +#: ../src/win32.c:135 +msgid "Geany project files" +msgstr "Geany Projetsfichieren" + +#: ../src/win32.c:141 +msgid "Executables" +msgstr "Ausféierbar Fichieren" + +#: ../plugins/classbuilder.c:37 +msgid "Class Builder" +msgstr "Klassengenerator" + +#: ../plugins/classbuilder.c:37 +msgid "Creates source files for new class types." +msgstr "Erstellt nei Klassen an engem neien Fichier." + +#: ../plugins/classbuilder.c:322 +msgid "Create Class" +msgstr "Nei Klass" + +#: ../plugins/classbuilder.c:332 +msgid "Class" +msgstr "Klass" + +#: ../plugins/classbuilder.c:341 +msgid "Class name:" +msgstr "Numm vun der Klass" + +#: ../plugins/classbuilder.c:352 +msgid "Header file:" +msgstr "Header Fichier:" + +#: ../plugins/classbuilder.c:361 +msgid "Source file:" +msgstr "Quellcode Fichier:" + +#: ../plugins/classbuilder.c:367 +msgid "Inheritance" +msgstr "Veriewung" + +#: ../plugins/classbuilder.c:376 +msgid "Base class:" +msgstr "Basis Klass" + +#: ../plugins/classbuilder.c:389 +msgid "Base header:" +msgstr "Basis Header Fichier:" + +#: ../plugins/classbuilder.c:397 +msgid "Global" +msgstr "Global" + +#: ../plugins/classbuilder.c:406 +msgid "Base GType:" +msgstr "Basis GType:" + +#: ../plugins/classbuilder.c:414 +msgid "Options" +msgstr "Optiounen" + +#: ../plugins/classbuilder.c:423 +msgid "Create constructor" +msgstr "Neie Konstruktor" + +#: ../plugins/classbuilder.c:427 +msgid "Create destructor" +msgstr "Neie Destruktor" + +#: ../plugins/classbuilder.c:437 +msgid "GTK+ constructor type" +msgstr "GTK+ Konstruktor Typ" + +#: ../plugins/classbuilder.c:744 +msgid "Create Cla_ss" +msgstr "Nei Kla_ss" + +#: ../plugins/classbuilder.c:750 +msgid "_C++ Class" +msgstr "_C++ Klass" + +#: ../plugins/classbuilder.c:753 +msgid "_GTK+ Class" +msgstr "_GTK+ Klass" + +#: ../plugins/htmlchars.c:38 +msgid "HTML Characters" +msgstr "HTML Zeechen" + +#: ../plugins/htmlchars.c:38 +msgid "Inserts HTML character entities like '&'." +msgstr "HTML Zeechen wei '&' afügen" + +#: ../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 "Geany Entwéckler Equipe" + +#: ../plugins/htmlchars.c:72 +msgid "HTML characters" +msgstr "HTML Zeechen" + +#: ../plugins/htmlchars.c:78 +msgid "ISO 8859-1 characters" +msgstr "ISO 8859-1 Buschtawen" + +#: ../plugins/htmlchars.c:176 +msgid "Greek characters" +msgstr "Griichesch Buschtaawen" + +#: ../plugins/htmlchars.c:231 +msgid "Mathematical characters" +msgstr "Mathematesch Buschtaawen" + +#: ../plugins/htmlchars.c:272 +msgid "Technical characters" +msgstr "Technesch Buschtaawen" + +#: ../plugins/htmlchars.c:280 +msgid "Arrow characters" +msgstr "Feiler" + +#: ../plugins/htmlchars.c:293 +msgid "Punctuation characters" +msgstr "Punktuatiounszeechen" + +#: ../plugins/htmlchars.c:309 +msgid "Miscellaneous characters" +msgstr "Verschidden Buschtawen" + +#: ../plugins/htmlchars.c:447 +msgid "Special Characters" +msgstr "Speziell Buschtawen" + +#: ../plugins/htmlchars.c:449 +msgid "_Insert" +msgstr "_Afügen" + +#: ../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 "" +"Wielt en speziellt Zeechen aus der Lëscht aus an klickt zwee mol drop oder " +"benotzt den Knäppchen fir et bei der aktueller Positioun vum Curseur " +"anzefügen." + +#: ../plugins/htmlchars.c:472 +msgid "Character" +msgstr "Buschtaaw" + +#: ../plugins/htmlchars.c:478 +msgid "HTML (name)" +msgstr "HTML (Numm)" + +#: ../plugins/htmlchars.c:678 +msgid "_Insert Special HTML Characters" +msgstr "Spez_iell HTML Zeechen afügen" + +#. Add menuitem for html replacement functions +#: ../plugins/htmlchars.c:690 +msgid "HTML Replacement" +msgstr "HTML ersetzen" + +#: ../plugins/htmlchars.c:697 +msgid "_HTMLToggle" +msgstr "_HTMLToggle" + +#: ../plugins/htmlchars.c:706 +msgid "Bulk replacement of special chars" +msgstr "Speziell Zeechen ersetzen" + +#: ../plugins/htmlchars.c:721 +msgid "Insert Special HTML Characters" +msgstr "Speziell HTML Zeechen afügen" + +#: ../plugins/htmlchars.c:724 +msgid "Replace special characters" +msgstr "Speziell Buschtawen ersetzen" + +#: ../plugins/htmlchars.c:727 +msgid "Toggle plugin status" +msgstr "PlugIn un an ausschalten" + +#: ../plugins/export.c:37 +msgid "Export" +msgstr "Exportéiren" + +#: ../plugins/export.c:37 +msgid "Exports the current file into different formats." +msgstr "Exportéiert den aktuellen Fichier an verschidden Formater." + +#: ../plugins/export.c:166 +msgid "Export File" +msgstr "Fichier exportéiren" + +#: ../plugins/export.c:183 +msgid "_Use current zoom level" +msgstr "Den akt_uellen Zoom Level benotzen." + +#: ../plugins/export.c:185 +msgid "" +"Renders the font size of the document together with the current zoom level" +msgstr "" +"Berücksichtegt den Zoomlevel fir d'Schrëftgréisst am exportéierten Dokument" + +#: ../plugins/export.c:267 +#, c-format +msgid "Document successfully exported as '%s'." +msgstr "Dokument mat Erfolleg als '%s' exportéiert." + +#: ../plugins/export.c:269 +#, c-format +msgid "File '%s' could not be written (%s)." +msgstr "Den Fichier '%s' konnt net geschriwwen ginn (%s)." + +#: ../plugins/export.c:316 +#, 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 +msgid "_Export" +msgstr "_Exportéiren" + +#. HTML +#: ../plugins/export.c:710 +msgid "As _HTML" +msgstr "Als _HTML" + +#. LaTeX +#: ../plugins/export.c:716 +msgid "As _LaTeX" +msgstr "Als _LateX" + +#: ../plugins/filebrowser.c:40 +msgid "File Browser" +msgstr "Fichier's Browser" + +#: ../plugins/filebrowser.c:40 +msgid "Adds a file browser tab to the sidebar." +msgstr "Fügt en Fichiersbrowser zur Saitenleescht bäi." + +#: ../plugins/filebrowser.c:323 +msgid "Too many items selected!" +msgstr "Zevill Elementer ausgewielt!" + +#: ../plugins/filebrowser.c:399 +#, 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 +msgid "Open _externally" +msgstr "Mat engem _externen Programm opmaachen" + +#: ../plugins/filebrowser.c:561 +msgid "_Find in Files" +msgstr "An den _Fichieren fannen" + +#: ../plugins/filebrowser.c:571 +msgid "Show _Hidden Files" +msgstr "Verstoppten Fic_hieren uweisen" + +#: ../plugins/filebrowser.c:763 +msgid "Up" +msgstr "Erop" + +#: ../plugins/filebrowser.c:768 +msgid "Refresh" +msgstr "Nei lueden" + +#: ../plugins/filebrowser.c:773 +msgid "Home" +msgstr "Perséinlechen Ordner" + +#: ../plugins/filebrowser.c:778 +msgid "Set path from document" +msgstr "Den Pad vum Dokument aus astellen" + +#: ../plugins/filebrowser.c:786 +msgid "Clear the filter" +msgstr "Filter läschen" + +#: ../plugins/filebrowser.c:800 +msgid "Filter:" +msgstr "Filter:" + +#: ../plugins/filebrowser.c:1019 +msgid "Focus File List" +msgstr "Lescht mat den Fichieren fokusseiren" + +#: ../plugins/filebrowser.c:1021 +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 +msgid "External open command:" +msgstr "Extern Opmaachen Commande:" + +#: ../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 "" +"Commande dei ausgefouert soll ginn bei \"Opmaachen mat\". Dier kënnt " +"d'Spécificateuren %f an %d benotzen.\n" +"%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 +msgid "Show hidden files" +msgstr "Verstoppten Fichieren uweisen" + +#: ../plugins/filebrowser.c:1113 +msgid "Hide object files" +msgstr "Objetsfichieren verstoppen" + +#: ../plugins/filebrowser.c:1117 +msgid "" +"Don't show generated object files in the file browser, this includes *.o, *." +"obj. *.so, *.dll, *.a, *.lib" +msgstr "" +"Erstallten Objetsfichieren net am Fichiersbrowser uweisen (*.o, *.obj. *." +"so, *.dll, *.a, *.lib)" + +#: ../plugins/filebrowser.c:1128 +#, fuzzy +msgid "Use the project's base directory" +msgstr "Stellt den Projetsbasisordner an" + +#: ../plugins/filebrowser.c:1132 +msgid "" +"Change the directory to the base directory of the currently opened project" +msgstr "" +"Den Ordner dem Basisordner vun engem Projet beim opmaachen vun engem Projet " +"upassen" + +#: ../plugins/saveactions.c:39 +msgid "Save Actions" +msgstr "Aktiounen späicheren" + +#: ../plugins/saveactions.c:39 +msgid "This plugin provides different actions related to saving of files." +msgstr "" +"Dësen PlugIn erméiglecht verschidden Actiounen déi mam späicheren vun " +"Fichieren verbonnen sinn." + +#: ../plugins/saveactions.c:169 +#, c-format +msgid "Backup Copy: Directory could not be created (%s)." +msgstr "Sécherheetskopie: Den Ordner konnt net erstallt ginn (%s)." + +#. it's unlikely that this happens +#: ../plugins/saveactions.c:201 +#, c-format +msgid "Backup Copy: File could not be read (%s)." +msgstr "Sécherheetskopie: Den Fichier konnt net gelies ginn (%s)." + +#: ../plugins/saveactions.c:219 +#, c-format +msgid "Backup Copy: File could not be saved (%s)." +msgstr "Sécherheetskopie: Den Fichier konnt net gespäichert ginn (%s)." + +#: ../plugins/saveactions.c:311 +#, c-format +msgid "Autosave: Saved %d file automatically." +msgid_plural "Autosave: Saved %d files automatically." +msgstr[0] "Automatesch späicheren: %d Fichier gespäichert." +msgstr[1] "Automatesch späicheren: %d Fichieren gespäichert." + +#. initialize the dialog +#: ../plugins/saveactions.c:380 +msgid "Select Directory" +msgstr "Ordner auswielen" + +#: ../plugins/saveactions.c:463 +msgid "Backup directory does not exist or is not writable." +msgstr "" +"Den Ordner fir Sécherheetskopien existéiert net oder kann net beschriwwen " +"ginn." + +#: ../plugins/saveactions.c:543 +msgid "Auto Save" +msgstr "Automatesch späicheren" + +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 +msgid "_Enable" +msgstr "Aschalt_en" + +#: ../plugins/saveactions.c:553 +msgid "Auto save _interval:" +msgstr "_Intervalle tëschent automateschem späicheren:" + +#: ../plugins/saveactions.c:561 +msgid "seconds" +msgstr "sekonnen" + +#: ../plugins/saveactions.c:570 +msgid "_Print status message if files have been automatically saved" +msgstr "_Statusmeldung ausginn wann Fichieren automatesch gespäichert goufen" + +#: ../plugins/saveactions.c:578 +msgid "Save only current open _file" +msgstr "Nëmmen momentan oppen _Fichieren späicheren" + +#: ../plugins/saveactions.c:585 +msgid "Sa_ve all open files" +msgstr "_All oppen Fichieren späicheren" + +#: ../plugins/saveactions.c:605 +msgid "Instant Save" +msgstr "Direkt späicheren" + +#: ../plugins/saveactions.c:615 +msgid "_Filetype to use for newly opened files:" +msgstr "Den _Fichierstyp den fir nei Fichieren soll benotzt ginn" + +#: ../plugins/saveactions.c:646 +msgid "Backup Copy" +msgstr "Sécherheetskopie" + +#: ../plugins/saveactions.c:656 +msgid "_Directory to save backup files in:" +msgstr "Or_dner wou Sécherheetskopien sollen gespäichert ginn:" + +#: ../plugins/saveactions.c:679 +msgid "Date/_Time format for backup files (\"man strftime\" for details):" +msgstr "" +"Datum/Zäi_t Format fir Sécherheetskopien (\"man strftime\" fir Detailer):" + +#: ../plugins/saveactions.c:692 +#, fuzzy +msgid "Directory _levels to include in the backup destination:" +msgstr "Dossiersniveauen déi an der Sécherheetskopie sollen iwwerholl ginn:" + +#: ../plugins/splitwindow.c:36 +msgid "Split Window" +msgstr "Fënster opdeelen" + +#: ../plugins/splitwindow.c:36 +msgid "Splits the editor view into two windows." +msgstr "Spléckt d'Editorsfënster an zwou Fënsteren op." + +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "All d'Iwwerteneestëmmungen am aktuellen Dokument markéieren" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +msgid "_Unsplit" +msgstr "Opspléck_ung réckgängeg maachen" + +#: ../plugins/splitwindow.c:399 +msgid "_Split Window" +msgstr "Fën_ster opdeelen" + +#: ../plugins/splitwindow.c:407 +msgid "_Horizontally" +msgstr "_Horizontal" + +#: ../plugins/splitwindow.c:412 +msgid "_Vertically" +msgstr "_Vertikal" + +#: ../plugins/splitwindow.c:427 +msgid "Split Horizontally" +msgstr "Horizontal opdeelen" + +#: ../plugins/splitwindow.c:429 +msgid "Split Vertically" +msgstr "Vertikal opdeelen" + +#: ../plugins/splitwindow.c:431 +msgid "Unsplit" +msgstr "Opspléckung réckgängeg maachen" + +#~ msgid "Diff file" +#~ msgstr "Diff Fichier" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText Fichier" + +#~ msgid "Select _All" +#~ msgstr "_All auswielen" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Automatesch Wuertvervollstännegung" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "Fir D'Geschirleescht unzepassen kënnt dier den Fichier 'ui_toolbar." +#~ "xml' benotzen. Ausféierleches dozou an der Dokumentatioun." + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "Fir dass d'Ännerungen an dësem Fichier wierksam ginn, muss Geany nei " +#~ "gestart ginn." diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/LINGUAS /tmp/ssBwSf4GIv/geany-0.18/po/LINGUAS --- geany-0.17/po/LINGUAS 2008-10-13 23:17:35.000000000 +0100 +++ geany-0.18/po/LINGUAS 2009-08-12 17:51:34.000000000 +0100 @@ -1,2 +1,2 @@ # set of available languages (in alphabetic order) -be bg ca cs de el en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sv tr uk vi zh_CN zh_TW +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 /tmp/H5qKeNSrz8/geany-0.17/po/Makefile.in.in /tmp/ssBwSf4GIv/geany-0.18/po/Makefile.in.in --- geany-0.17/po/Makefile.in.in 2009-05-02 18:50:04.000000000 +0100 +++ geany-0.18/po/Makefile.in.in 2009-08-16 18:29:11.000000000 +0100 @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/nl.po /tmp/ssBwSf4GIv/geany-0.18/po/nl.po --- geany-0.17/po/nl.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/nl.po 2009-08-16 17:18:28.000000000 +0100 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.16\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\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" "Language-Team: Dutch \n" @@ -29,76 +29,76 @@ msgid "Integrated Development Environment" msgstr "" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Over Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Een snel en lichtgewicht IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, fuzzy, c-format msgid "(built on or after %s)" msgstr "(gebouwd op %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Info" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Ontwikkelaars" -#: ../src/about.c:264 +#: ../src/about.c:266 #, fuzzy msgid "maintainer" msgstr "Hoofdontwikkelaar" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "ontwikkelaar" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "vertalingscoördinator" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Vertalers" -#: ../src/about.c:309 +#: ../src/about.c:311 #, fuzzy msgid "Previous Translators" msgstr "Vertalers" -#: ../src/about.c:330 +#: ../src/about.c:332 #, fuzzy msgid "Contributors" msgstr "Woord vervolledigen" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Credits" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licentie" -#: ../src/about.c:389 +#: ../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 "" -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, fuzzy, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -107,119 +107,119 @@ "Kon terminal '%s' niet vinden (controleer de instelling van het pad voor " "hulpprogramma terminal in Voorkeuren)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Proces mislukt (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (in map: %s)" -#: ../src/build.c:637 +#: ../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:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Compilatie mislukt." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Compilatie met succes beëindigd." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Compileren" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 #, fuzzy msgid "Make Custom _Target" msgstr "Make aangepast _doel" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 #, fuzzy msgid "Make _Object" msgstr "Make _object" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 #, fuzzy msgid "_Next Error" msgstr "Fout" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 #, fuzzy msgid "_Previous Error" msgstr "Zoek Vor_ige" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "Programma parameters instellen" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 #, fuzzy msgid "LaTeX -> _DVI" msgstr "LaTeX -> DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 #, fuzzy msgid "LaTeX -> _PDF" msgstr "LaTeX -> PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 #, fuzzy msgid "_View DVI File" msgstr "DVI bestand weergeven" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 #, fuzzy msgid "V_iew PDF File" msgstr "PDF besand weergeven" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 #, fuzzy msgid "_Set Arguments" msgstr "Argumenten instellen" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Argumenten instellen" -#: ../src/build.c:1326 +#: ../src/build.c:1313 #, fuzzy msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" @@ -227,23 +227,23 @@ "bestanden.\n" "De bestandsnaam wordt automatisch aan het einde toegevoegd.\n" -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -253,74 +253,74 @@ "%e zal worden vervangen door de bestandsnaam zonder extensie, bijv " "test_bestand" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Programma parameters instellen" -#: ../src/build.c:1506 +#: ../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." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, fuzzy, c-format msgid "%s commands" msgstr " commandos" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Compileer:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Bouwen:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Uitvoeren:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 #, fuzzy msgid "Build the current file" msgstr "Huidig bestand compileren" -#: ../src/build.c:1926 +#: ../src/build.c:1917 #, fuzzy msgid "Make Custom Target" msgstr "Make aangepast doel" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Voer hier de aangepaste opties in, alle ingevoerde tekst wordt aan het " "commando 'make' overgegeven." -#: ../src/build.c:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 #, fuzzy msgid "Compile the current file with Make" msgstr "Huidig bestand compileren" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Kon het weergaveprogramma niet uitvoeren" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, fuzzy, c-format msgid "Process could not be stopped (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "" @@ -328,8 +328,8 @@ msgid "Do you really want to quit?" msgstr "Wilt u Geany werkelijk afsluiten?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Herladen" @@ -342,58 +342,58 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Bent u zeker om '%s' te herladen?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 #, fuzzy msgid "Go to Line" msgstr "Ga naar regel" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 #, fuzzy msgid "Enter the line you want to go to:" msgstr "Voer het regelnummer in waarnaar u wilt springen" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 #, fuzzy msgid "_Use Custom Date Format" msgstr "Gebruik het standaard datumformaat" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 #, fuzzy msgid "Custom Date Format" msgstr "Standaard datumformaat" -#: ../src/callbacks.c:1495 +#: ../src/callbacks.c:1498 #, fuzzy msgid "" "Enter here a custom date and time format. You can use any conversion " @@ -403,25 +403,25 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Datumformaatstring kon niet worden geconverteerd (waarschijlijk te lang)." -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "" #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Bestand openen" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Beeld" -#: ../src/dialogs.c:150 +#: ../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." @@ -429,32 +429,32 @@ "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:172 +#: ../src/dialogs.c:169 #, fuzzy msgid "Detect by file extension" msgstr "Herkenning door bestandsextensie" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 #, fuzzy msgid "Detect from file" msgstr "Map selecteren" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "Functies" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "_Verborgen bestanden weergeven" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 #, fuzzy msgid "Set encoding:" msgstr "_Codering instellen" -#: ../src/dialogs.c:287 +#: ../src/dialogs.c:286 #, fuzzy msgid "" "Explicitly defines an encoding for the file, if it would not be detected. " @@ -469,11 +469,11 @@ "het gekozen bestandstype." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Bestandstype instellen:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -485,50 +485,75 @@ "Notitie: indien u meerdere bestanden kiest, worden deze allen geopend met " "het gekozen bestandstype." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Bestand opslaan" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 #, fuzzy msgid "R_ename" msgstr "Vietnamees" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "" -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Fout" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Vraag" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informatie" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Niet opslaan" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, fuzzy, c-format msgid "The file '%s' is not saved." msgstr "Het bestand \"%s\" is niet geldig %s." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 #, fuzzy 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?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Lettertype kiezen" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -536,107 +561,107 @@ "Er is een fout opgetreden of er kon geen bestandsinformatie worden opgehaald " "(bijv van een nieuw bestand)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "Ongekend" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Eigenschappen" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Bestandstype:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Grootte:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Locatie:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Alleen lezen:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(enkel binnenin Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Codering:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(met BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(zonder BOM" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Gemodifieert:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Gewijzigd:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Toegang tot:Permissions:" msgstr "Lettertypes" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Lezen:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Schrijven:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Eigenaar:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Groep:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Andere:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Bestand %s gesloten." -#: ../src/document.c:791 +#: ../src/document.c:745 #, fuzzy, c-format msgid "New file \"%s\" opened." msgstr "Nieuw bestand geopend." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Kon bestand %s niet openen (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -647,12 +672,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Het bestand \"%s\" is niet geldig %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -661,51 +686,54 @@ "Het bestand \"%s\" lijkt niet op een tekstbestand of een de bestandscodering " "is niet ondersteund." -#: ../src/document.c:1168 +#: ../src/document.c:1122 #, fuzzy msgid "Spaces" msgstr "Naamruimtes" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "" -#: ../src/document.c:1174 +#: ../src/document.c:1128 #, fuzzy msgid "Tabs and Spaces" msgstr "_Vervang tabs door spaties" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1179 +#: ../src/document.c:1133 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Auto inspringing" -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Ongeldige bestandsnaam" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Bestand %s herladen." -#: ../src/document.c:1354 +#. 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 "Bestand %s geopend (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", alleen lezen" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "Fout bij het opslaan van het bestand." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, fuzzy, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -715,59 +743,59 @@ "8 in \"%s\". Het bestand blijft niet opgeslagen.\n" "Foutmelding: %s\n" -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, fuzzy, c-format msgid "Error message: %s." msgstr "Fout bij het opslaan van het bestand (%s)." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Fout bij het opslaan van het bestand." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Fout bij het opslaan van het bestand (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Bestand %s opgeslagen." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "" -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 +#: ../src/search.c:1689 #, fuzzy, c-format msgid "No matches found for \"%s\"." msgstr "Geen overeenkomsten gevonden voor '%s'" -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../src/document.c:2022 ../src/document.c:2031 #, fuzzy, 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\"." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Wenst u het opnieuw te laden?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -776,33 +804,21 @@ "Het bestand '%s' op de schijf is recenter als\n" "de huidig geopende versie." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 #, fuzzy msgid "Enter Tab Width" msgstr "Tabgrootte:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" @@ -903,137 +919,126 @@ msgstr "Traditioneel Chinees" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japans" -#: ../src/encodings.c:141 ../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 "Koreaans" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 #, fuzzy msgid "Without encoding" msgstr "_Codering instellen" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_West-Europees" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Oost-Europees" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "_Oost-_Aziatisch" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_ZO & ZW Aziatisch" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Midden Oosten" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Geen" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 +#: ../src/filetypes.c:237 ../src/filetypes.c:259 #, fuzzy, c-format msgid "%s source file" msgstr "C bronbestand" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "C bronbestand" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Geen" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Shell scriptbestand" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makebestand" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 #, fuzzy msgid "XML document" msgstr "Volledig document" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 #, fuzzy msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL Dump bestand" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff bestand" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Configuratiebestand" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 #, fuzzy msgid "Gettext translation file" msgstr "vertalingscoördinator" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, fuzzy, c-format msgid "%s script file" msgstr "Shell scriptbestand" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Alle bestanden" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "naamloos" @@ -1048,8 +1053,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "onzichtbaar" @@ -1057,7 +1062,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 #, fuzzy msgid "Open Selected F_ile" msgstr "Bestand openen" @@ -1081,12 +1086,12 @@ msgid "Page Set_up" msgstr "" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 #, fuzzy msgid "Close Ot_her Documents" msgstr "Huidig bestand sluiten" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 #, fuzzy msgid "C_lose All" msgstr "_Alles sluiten" @@ -1095,96 +1100,92 @@ msgid "_Edit" msgstr "Be_werken" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "_Alles selecteren" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "Inde_ling" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 #, fuzzy msgid "T_oggle Case of Selection" msgstr "Kloon regel of selectie" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 #, fuzzy msgid "_Comment Line(s)" msgstr "_Plaats het hekje voor de regel" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 #, fuzzy msgid "U_ncomment Line(s)" msgstr "Lijn" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 #, fuzzy msgid "_Toggle Line Commentation" msgstr "_Regelcommentaar inschakelen" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 #, fuzzy msgid "Du_plicate Line or Selection" msgstr "Kloon regel of selectie" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "I_nspringing vergroten" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "In_springing verkleinen" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "_In selectie" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 #, fuzzy msgid "_Send Selection to" msgstr "_In selectie" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "_Commentaren Invoegen" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Logboek item invoegen" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 #, fuzzy msgid "Insert File _Header" msgstr "Bestandshoofding invoegen" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 #, fuzzy msgid "Insert _Function Description" msgstr "Functiebschrijving invoegen" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Multiregel commentaar invoegen" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 #, fuzzy msgid "Insert _GPL Notice" msgstr "GPL-informatie invoegen" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 #, fuzzy msgid "Insert _BSD License Notice" msgstr "GPL-informatie invoegen" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "_Datum invoegen" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" _invoegen" @@ -1210,7 +1211,7 @@ msgid "Find in F_iles" msgstr "Zoek in _bestanden" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Vervangen" @@ -1234,7 +1235,7 @@ msgid "Pr_evious Message" msgstr "Berichten" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 #, fuzzy msgid "_Go to Line" msgstr "_Ga naar regel" @@ -1264,7 +1265,7 @@ msgid "Show Side_bar" msgstr "_Zijbalk weergeven" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1314,16 +1315,16 @@ msgid "In_dent Type" msgstr "" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 #, fuzzy msgid "_Spaces" msgstr "Naamruimtes" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 #, fuzzy msgid "T_abs and Spaces" msgstr "_Vervang tabs door spaties" @@ -1467,7 +1468,7 @@ msgid "_Debug Messages" msgstr "Berichten" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Symbolen" @@ -1492,84 +1493,89 @@ msgid "Scribble" msgstr "Notities" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 #, fuzzy msgid "Images _and Text" msgstr "Pictogrammen met tekst" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 #, fuzzy msgid "_Images Only" msgstr "Enkel pictogrammen" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 #, fuzzy msgid "_Text Only" msgstr "Enkel tekst" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 #, fuzzy msgid "_Large Icons" msgstr "Grote pictogrammen" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 #, fuzzy msgid "_Small Icons" msgstr "Kleine pictogrammen" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "Kleine pictogrammen" -#: ../src/interface.c:1770 +#: ../src/interface.c:1769 #, fuzzy -msgid "_Hide toolbar" +msgid "_Customize Toolbar" msgstr "Werkbalk verbergen" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "Werkbalk verbergen" + +#: ../src/interface.c:2094 #, fuzzy msgid "Find _Usage" msgstr "Zoek boodschappen" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 #, fuzzy msgid "Find _Document Usage" msgstr "Zoek boodschappen" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 #, fuzzy msgid "Go to _Tag Definition" msgstr "Ga naar tag definitie" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 #, fuzzy msgid "Go to T_ag Declaration" msgstr "Ga naar tag declaratie" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 #, fuzzy msgid "Conte_xt Action" msgstr "_In selectie" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Voorkeuren" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Laad bestanden van de laatste sessie" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Opent bij opstarten de bestanden van de laatste sessie" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 #, fuzzy msgid "Load virtual terminal support" msgstr "Virtuele terminalemulatie laden bij opstarten" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1578,82 +1584,82 @@ "Of de virtuele terminalemulatie (VTE) moet worden geladen bij het opstarten." "Schakel deze functie uit indien u dit niet nodig heeft." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 #, fuzzy msgid "Startup" msgstr "Zijbalk" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Bewaar vensterpositie en geometrie" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "afsluiten bevestigen" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Toont een bevestigingsvenster bij afsluiten." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 #, fuzzy msgid "Shutdown" msgstr "Lettertypes" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "" -#: ../src/interface.c:2758 +#: ../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 "" -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 #, fuzzy msgid "Project files:" msgstr "Eigenschappen" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 #, fuzzy msgid "Paths" msgstr "Lettertypes" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 #, fuzzy msgid "Startup" msgstr "Status" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Beep bij fouten of wanneer compilatie is beëindigd" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1662,11 +1668,11 @@ "Of er een beeptoon moet worden weergegeven bij een fout of wanneer het " "compilatieproces is beëindigd." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Schakel naar statusmeldingsvenster bij nieuw bericht" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1675,78 +1681,78 @@ "Schakel naar de tab statusberichten (onderaan in het notitieboek venster) " "indien een er een nieuw statusbericht is." -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." msgstr "" -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" msgstr "" -#: ../src/interface.c:2866 +#: ../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 "" -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 #, fuzzy msgid "Miscellaneous" msgstr "Weergave" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "" -#: ../src/interface.c:2891 +#: ../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:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2896 +#: ../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:2898 +#: ../src/interface.c:2918 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Ongeldige map voor zoeken in bestanden." -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 #, fuzzy msgid "Search" msgstr "Zijbalk" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 #, fuzzy msgid "Use project-based session files" msgstr "Eigenschappen" -#: ../src/interface.c:2924 +#: ../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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "" -#: ../src/interface.c:2929 +#: ../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 " @@ -1754,200 +1760,205 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 #, fuzzy msgid "Projects" msgstr "Lettertypes" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 #, fuzzy msgid "Miscellaneous" msgstr "Weergave" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Algemeen" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Toon symbolenlijst" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Schakelt de symbolenlijst aan en uit" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 #, fuzzy msgid "Show documents list" msgstr "Toon open bestanden lijst" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 #, fuzzy msgid "Toggle the documents list on and off" msgstr "Schakelt de symbolenlijst aan en uit" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Zijbalk" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 #, fuzzy msgid "Symbol list:" msgstr "Toon symbolenlijst" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 #, fuzzy msgid "Message window:" msgstr "Berichtenvenster" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 #, fuzzy msgid "Editor:" msgstr "Editor" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Stelt het lettertype in voor het berichtenvenster" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 #, fuzzy msgid "Sets the font for the symbol list" msgstr "Stelt het lettertype in voor de symbolenlijst" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 #, fuzzy msgid "Sets the editor font" msgstr "Lettertype editor" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Lettertypes" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 #, fuzzy msgid "Show close buttons" msgstr "Kleurkiezer knop weergeven" -#: ../src/interface.c:3064 +#: ../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 "" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 #, fuzzy msgid "Placement of new file tabs:" msgstr "Plaatsing van nieuwe bestanden tabs:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Links" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 #, fuzzy 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 #, fuzzy msgid "File tabs will be placed on the right of the notebook" msgstr "Nieuwe bestanden tabs zullen rechts van de tab lijst worden geplaatst" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 #, fuzzy msgid "Editor tabs" msgstr "Lettertypes" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Bovenaan" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Onderaan" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 #, fuzzy msgid "Sidebar:" msgstr "Zijbalk" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 #, fuzzy msgid "Tab positions" msgstr "Locatie:" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 #, fuzzy msgid "Show status bar" msgstr "Werkbalk weergeven" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 msgid "Whether to show the status bar at the bottom of the main window" msgstr "" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "Werkbalk weergeven" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 #, fuzzy msgid "Toolbar" msgstr "Lettertypes" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 #, fuzzy msgid "Icon style:" msgstr "Pictogramstijl" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 #, fuzzy msgid "Icon size:" msgstr "Pictogramgrootte" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Uiterlijk" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "_Werkbalk weergeven" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Werkbalk" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Regelterugloop" -#: ../src/interface.c:3349 +#: ../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 " @@ -1957,11 +1968,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:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "" -#: ../src/interface.c:3354 +#: ../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 " @@ -1970,39 +1981,39 @@ "its current position." msgstr "" -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "" -#: ../src/interface.c:3359 +#: ../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 "" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Invouwen activeren" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Of invouwen van code moet worden geactiveerd" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "" -#: ../src/interface.c:3369 +#: ../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 "" -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Gebruik markeringen om compile fouten weer te geven" -#: ../src/interface.c:3374 +#: ../src/interface.c:3418 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -2012,299 +2023,308 @@ "regels te markeren waarin de compiler een waarschuwing of een fout heeft " "gevonden." -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 #, fuzzy msgid "Newline strips trailing spaces" msgstr "Lege spaties aan regeleinde verwijderen" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 #, fuzzy msgid "Comment toggle marker:" msgstr "'Lange regel' marker" -#: ../src/interface.c:3406 +#: ../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 "" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Functies" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 #, fuzzy msgid "Features" msgstr "Functies" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 #, fuzzy msgid "Auto-indent mode:" msgstr "Auto inspringing" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 #, fuzzy msgid "Basic" msgstr "Baltisch" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 #, fuzzy msgid "Type:" msgstr "Type" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 #, fuzzy msgid "Width:" msgstr "Schrijven:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 #, fuzzy msgid "The width in chars of a single indent" msgstr "De breedte in tekens, die één tabteken inneemt" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 #, fuzzy msgid "Hard tab width:" msgstr "Tabgrootte:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 #, fuzzy msgid "Tab key indents" msgstr "Inspringing vergroten" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 #, fuzzy msgid "Indentation" msgstr "Locatie:" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 #, fuzzy msgid "Indentation" msgstr "Locatie:" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 #, fuzzy msgid "Snippet completion" msgstr "Autovervollediging onderdrukken" -#: ../src/interface.c:3581 +#: ../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:3583 +#: ../src/interface.c:3627 #, fuzzy -msgid "XML tag auto completion" +msgid "XML tag autocompletion" msgstr "XML-tag autovervollediging" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 #, fuzzy msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Automatische voltooiing van open XML-tags (HTML-tags inbegrepen)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3591 +#: ../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 "" -#: ../src/interface.c:3593 -#, fuzzy -msgid "Automatic symbol completion" -msgstr "Autovervollediging onderdrukken" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "" + +#: ../src/interface.c:3646 +#, fuzzy +msgid "Drop rest of word on completion" +msgstr "Autovervollediging onderdrukken" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" +msgstr "Autovervollediging van constructies" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3692 #, fuzzy -msgid "Display height in rows for the auto completion list" +msgid "Display height in rows for the autocompletion list" msgstr "Weer te geven aantal regels in de autovoltooiingslijst." -#: ../src/interface.c:3649 +#: ../src/interface.c:3701 #, fuzzy -msgid "Maximum number of entries to display in the auto completion list" +msgid "Maximum number of entries to display in the autocompletion list" msgstr "Weer te geven aantal regels in de autovoltooiingslijst." -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 #, fuzzy msgid "Completions" msgstr "Locatie:" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 #, fuzzy msgid "Completions" msgstr "Locatie:" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Inspringingsmarkeringen weergeven" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 #, fuzzy 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 " "vergemakkelijken" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Lege spaties weergeven" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Markeert lege spaties met punten en tabs met pijlen." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Regeleinden weergeven" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "Toont het regeleinde teken" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 #, fuzzy msgid "Show line numbers" msgstr "_Regelnummers weergeven" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Toont of verbergt de regelnummerrand" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 #, fuzzy msgid "Show markers margin" msgstr "_Markeerrand weergeven" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2313,39 +2333,39 @@ "Toont of verbergt de smalle rand rechts van de regelnummers, welke wordt " "gebruikt om regels te markeren" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 #, fuzzy msgid "Stop scrolling at last line" msgstr "Huidig bestand compileren" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Weergave" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 #, fuzzy msgid "Long line marker:" msgstr "'Lange regel' marker" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 #, fuzzy msgid "Long line marker color:" msgstr "Kleur 'lange regel' marker" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Stelt de kleur van de 'lange regel' marker in" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Kleurkiezer" -#: ../src/interface.c:3826 +#: ../src/interface.c:3878 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2356,11 +2376,11 @@ "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." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Lijn" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2369,11 +2389,11 @@ "Geeft een verticale lijn weer in het bewerkingsvenster op de huidige " "cursorpositie (zie hieronder)." -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Achtergrond" -#: ../src/interface.c:3846 +#: ../src/interface.c:3898 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2384,150 +2404,150 @@ "veranderde naar de kleurinstelling hieronder. (Aangeraden indien u " "proportionele lettertypen gebruikt)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Uitgeschakeld" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Lange regel marker" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 #, fuzzy msgid "Display" msgstr "Weergave" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 #, fuzzy msgid "Default end of line characters:" msgstr "Standaard codering:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Nieuwe bestanden" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 #, fuzzy msgid "Default encoding (new files):" msgstr "Standaard codering:" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 #, fuzzy msgid "Default encoding (existing files):" msgstr "Standaard codering:" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "Stelt de standaard codering in voor nieuw aangemaakte bestanden" -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "" -#: ../src/interface.c:3978 +#: ../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:3980 +#: ../src/interface.c:4032 #, fuzzy msgid "Encodings" msgstr "Codering:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Nieuwe regel aan einde van het bestand" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Lege spaties aan regeleinde verwijderen" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Verwijdert lege spaties aan regeleinden" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Vervang tabs door spaties" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Vervangt alle tabs in het document door spaties" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Saving files" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Lengte 'laatst geopende bestanden' lijst:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 #, fuzzy 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 " "bestanden' lijst" -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 #, fuzzy msgid "Files" msgstr "_Bestand" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 #, fuzzy msgid "Make:" msgstr "Make" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 #, fuzzy msgid "Terminal:" msgstr "Terminal" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 #, fuzzy msgid "Browser:" msgstr "Browser" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Pad en optie's voor het hulpprogramma 'make'" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2535,26 +2555,26 @@ "Een terminalemulator zoals xterm, gnome-terminal of konsole (zou het -e " "argument moeten accepteren" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pad (en mogelijke bijkomende argumenten)" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 #, fuzzy msgid "Grep:" msgstr "Grep" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 #, fuzzy msgid "Tool paths" msgstr "Lettertypes" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 #, fuzzy msgid "Context action:" msgstr "_In selectie" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2562,75 +2582,75 @@ "execution." msgstr "" -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 #, fuzzy msgid "Commands" msgstr "Tab plaatsing" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Hulpprogramma's" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "E-mailadres van de ontwikkelaar" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Initialen van de ontwikkelaar" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 #, fuzzy msgid "Initial version:" msgstr "Initiële versie" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Versienummer, welke een nieuw bestand initieel heeft" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Bedrijfsnaam" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 #, fuzzy msgid "Developer:" msgstr "Ontwikkelaar" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 #, fuzzy msgid "Company:" msgstr "Bedrijf" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 #, fuzzy msgid "Mail address:" msgstr "E-mailadres" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 #, fuzzy msgid "Initials:" msgstr "Initialen" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "De naam van de ontwikkelaar" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 #, fuzzy msgid "Year:" msgstr "Zijbalk" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 #, fuzzy msgid "Date:" msgstr "Make" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4382 +#: ../src/interface.c:4434 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2640,7 +2660,7 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/interface.c:4389 +#: ../src/interface.c:4441 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2650,7 +2670,7 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/interface.c:4396 +#: ../src/interface.c:4448 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2660,91 +2680,91 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 #, fuzzy msgid "Template data" msgstr "Tab plaatsing" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Sjablonen" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 #, fuzzy msgid "C_hange" msgstr "Wijzigen" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 #, fuzzy msgid "Keyboard shortcuts" msgstr "Sneltoetsen" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Sneltoetsen" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 #, fuzzy msgid "Command:" msgstr "Commando" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, fuzzy, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 #, fuzzy msgid "Print line numbers" msgstr "_Regelnummers weergeven" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Pad van het huidige bestand volgen" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 #, fuzzy msgid "Print page numbers" msgstr "_Regelnummers weergeven" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "" -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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 "" -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 #, fuzzy msgid "Use the basename of the printed file" msgstr "Pad van het huidige bestand volgen" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "Pad van het huidige bestand volgen" -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 #, fuzzy msgid "Date format:" msgstr "Standaard datumformaat" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../src/interface.c:4608 ../src/printing.c:422 #, fuzzy msgid "" "Specify a format for the date and time stamp which is added to the page " @@ -2755,609 +2775,628 @@ "het even welke conversie specifieerder welke kan gebruikt worden met de ANSI " "C strftime functie. Lees \"man strftime\" voor meer informatie." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 #, fuzzy msgid "Printing" msgstr "Afdrukken" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 #, fuzzy msgid "Project Properties" msgstr "Eigenschappen" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 #, fuzzy msgid "File" msgstr "_Bestand" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nieuw" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Openen" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 #, fuzzy msgid "Open selected file" msgstr "Bestanden openen" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Opslaan" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 #, fuzzy msgid "Save as" msgstr "Alles opslaan" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Alles opslaan" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Afdrukken" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Sluiten" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Alles sluiten" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Bestand herladen" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 #, fuzzy msgid "Project" msgstr "Make _object" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 #, fuzzy msgid "Project properties" msgstr "Eigenschappen" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Ongedaan maken" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Herdoen" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Kloon regel of selectie" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 #, fuzzy msgid "Delete current line(s)" msgstr "Huidig bestand sluiten" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "Huidig bestand sluiten" + +#: ../src/keybindings.c:244 #, fuzzy msgid "Transpose current line" msgstr "Drukt het huidige bestand af" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 #, fuzzy msgid "Scroll to current line" msgstr "Huidig bestand compileren" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 #, fuzzy msgid "Scroll up the view by one line" msgstr "Huidig bestand compileren" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 #, fuzzy msgid "Complete snippet" msgstr "Woord vervolledigen" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 #, fuzzy msgid "Suppress snippet completion" msgstr "Autovervollediging onderdrukken" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 #, fuzzy msgid "Context Action" msgstr "_In selectie" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Woord vervolledigen" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Hulptip weergeven" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Macrolijst weergeven" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 #, fuzzy msgid "Copy" msgstr "Bedrijf" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 #, fuzzy msgid "Copy current line(s)" msgstr "Huidig bestand compileren" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 #, fuzzy msgid "Cut current line(s)" msgstr "Huidig bestand sluiten" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 #, fuzzy msgid "Select" msgstr "Alles selecteren" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Alles selecteren" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 #, fuzzy msgid "Select current word" msgstr "Huidig bestand opslaan" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 #, fuzzy msgid "Select current line(s)" msgstr "Huidig bestand opslaan" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 #, fuzzy msgid "Select current paragraph" msgstr "Huidig bestand opslaan" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 #, fuzzy msgid "Format" msgstr "Inde_ling" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 #, fuzzy msgid "Toggle Case of Selection" msgstr "Schakel regelcommentaar uit" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Schakel regelcommentaar uit" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 #, fuzzy msgid "Comment line(s)" msgstr "Plaats hekje voor regel" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 #, fuzzy msgid "Uncomment line(s)" msgstr "Verwijder hekje voor regel" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Inspringing vergroten" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Inspringing verkleinen" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 #, fuzzy msgid "Increase indent by one space" msgstr "Inspringing vergroten" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 #, fuzzy msgid "Decrease indent by one space" msgstr "Inspringing verkleinen" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 #, fuzzy msgid "Send to Custom Command 1" msgstr "Aangepast datumformaat instellen" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 #, fuzzy msgid "Send to Custom Command 2" msgstr "Aangepast datumformaat instellen" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 #, fuzzy msgid "Send to Custom Command 3" msgstr "Aangepast datumformaat instellen" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "_In selectie" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 #, fuzzy msgid "Insert" msgstr "Datum invoegen" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Datum invoegen" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 #, fuzzy msgid "Settings" msgstr "Sectie" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 #, fuzzy msgid "Search" msgstr "_Zoeken" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Zoek" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Zoek volgende" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Zoek vorige" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 #, fuzzy msgid "Find Next Selection" msgstr "_In selectie" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 #, fuzzy msgid "Find Previous Selection" msgstr "Zoek vorige" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Vervangen" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 #, fuzzy msgid "Find in Files" msgstr "Zoek in _bestanden" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 #, fuzzy msgid "Next Message" msgstr "Berichten" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 #, fuzzy msgid "Previous Message" msgstr "Berichten" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Zoek boodschappen" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 #, fuzzy msgid "Find Document Usage" msgstr "Zoek boodschappen" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "_Make all" + +#: ../src/keybindings.c:369 #, fuzzy msgid "Go to" msgstr "Ga naar regel" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 #, fuzzy msgid "Go to matching brace" msgstr "Ga naar regel" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 #, fuzzy msgid "Toggle marker" msgstr "'Lange regel' marker" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 #, fuzzy msgid "Go to next marker" msgstr "'Lange regel' marker" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 #, fuzzy msgid "Go to previous marker" msgstr "'Lange regel' marker" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 #, fuzzy msgid "Go to Tag Definition" msgstr "Ga naar tag definitie" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 #, fuzzy msgid "Go to Tag Declaration" msgstr "Ga naar tag declaratie" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 #, fuzzy msgid "Go to Start of Line" msgstr "Ga naar regel" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 #, fuzzy msgid "Go to End of Line" msgstr "Ga naar regel" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Ga naar regel" + +#: ../src/keybindings.c:400 #, fuzzy msgid "Go to Previous Word Part" msgstr "'Lange regel' marker" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 #, fuzzy msgid "Go to Next Word Part" msgstr "'Lange regel' marker" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 #, fuzzy msgid "View" msgstr "_Beeld" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Volledig scherm" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Berichtenvenster verbergen" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Zijbalk verbergen" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Inzoomen" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Uitzoomen" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 #, fuzzy msgid "Focus" msgstr "_Document" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Sckakel naar Editor" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Schakel naar Notities" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Schakel naar VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 #, fuzzy msgid "Switch to Search Bar" msgstr "Schakel naar Notities" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 #, fuzzy msgid "Switch to Sidebar" msgstr "Schakel naar Notities" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 #, fuzzy msgid "Switch to Compiler" msgstr "Schakel naar Notities" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 #, fuzzy msgid "Notebook tab" msgstr " commandos" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Schakel naar linker document" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Schakel naar rechter document" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 #, fuzzy msgid "Switch to last used document" msgstr "Schakel naar linker document" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 #, fuzzy msgid "Move document left" msgstr "Volledig document" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 #, fuzzy msgid "Move document right" msgstr "Volledig document" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 #, fuzzy msgid "Move document first" msgstr "Volledig document" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 #, fuzzy msgid "Move document last" msgstr "Volledig document" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 #, fuzzy msgid "Document" msgstr "_Document" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 #, fuzzy msgid "Toggle Line wrapping" msgstr "Regelterugloop" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 #, fuzzy msgid "Toggle Line breaking" msgstr "_Regelcommentaar inschakelen" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 #, fuzzy msgid "Replace spaces by tabs" msgstr "_Vervang tabs door spaties" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 #, fuzzy msgid "Toggle current fold" msgstr "Huidig bestand opslaan" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Alles invouwen" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Alles uitvouwen" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Symbolenlijst herladen" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Bouwen" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Compileer" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Make aangepast doel" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make object" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 #, fuzzy msgid "Previous error" msgstr "Vertalers" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Uitvoeren" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Uitvoeren (alternatief commando)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Bouwopties" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 #, fuzzy msgid "Show Color Chooser" msgstr "Kleurkiezer weergeven" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 #, fuzzy msgid "Help" msgstr "_Help" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 #, fuzzy msgid "Keyboard Shortcuts" msgstr "_Sneltoetsen" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 #, fuzzy msgid "The following keyboard shortcuts are configurable:" msgstr "Volgende sneltoetsen zijn gedefinieert:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 #, fuzzy msgid "Switch to Document" msgstr "Schakel naar linker document" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 #, fuzzy msgid "Failed to load one or more session files." msgstr "bestanden van vorige sessies niet laden" -#: ../src/log.c:177 +#: ../src/log.c:181 #, fuzzy msgid "Debug Messages" msgstr "Berichten" @@ -3420,7 +3459,7 @@ msgstr "" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "bestanden van vorige sessies niet laden" #: ../src/main.c:143 @@ -3438,24 +3477,24 @@ msgid "Show version and exit" msgstr "toon versie en sluit af" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3464,14 +3503,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3483,22 +3522,22 @@ "configuratiemap.\n" "Geany sowieso starten?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Dit is Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 #, fuzzy msgid "Configuration files reloaded." msgstr "%s configuratiebestand, bewerk het inien nodig" @@ -3517,18 +3556,18 @@ msgid "_Hide Message Window" msgstr "Berichtenvenster" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3536,61 +3575,71 @@ "Author(s): %s" msgstr "" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 #, fuzzy msgid "Active" msgstr "Actie" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "" -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "" -#: ../src/plugins.c:1263 +#: ../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:1276 +#: ../src/plugins.c:1263 #, fuzzy msgid "Plugin details:" msgstr "Locatie:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Actie" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Sneltoets" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 #, fuzzy msgid "Grab Key" msgstr "Toets vastleggen" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, fuzzy, 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\"" -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +#, fuzzy +msgid "_Expand All" +msgstr "Zoek" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +#, fuzzy +msgid "_Collapse All" +msgstr "_Alles sluiten" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Actie" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Sneltoets" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, fuzzy, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" @@ -3599,7 +3648,7 @@ #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 #, fuzzy msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" @@ -3607,7 +3656,7 @@ "(hulpprogramma's die u niet nodig heeft kunt u leeg laten)" #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 #, fuzzy msgid "" "Set the information to be used in templates. See the documentation for " @@ -3616,7 +3665,7 @@ "Specificeer hier de informatie die u wenst te gebruiken in sjablonen.\n" "Lees de documentatie indien u niet weet hoe sjablonen werken." -#: ../src/prefs.c:1458 +#: ../src/prefs.c:1523 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3627,7 +3676,7 @@ "dient u Geany te herstarten om deze te activeren." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../src/prefs.c:1529 #, fuzzy msgid "" "Here you can change keyboard shortcuts for various actions. Select one and " @@ -3639,66 +3688,67 @@ "in te geven. U kunt ook de stringrepresentatie rechtstreeks wijzigen." #. page Printing -#: ../src/prefs.c:1469 +#: ../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 "" -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -#: ../src/printing.c:270 +#: ../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 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Gewijzigd:" -#: ../src/printing.c:340 +#: ../src/printing.c:375 #, fuzzy msgid "Document Setup" msgstr "Locatie:" -#: ../src/printing.c:375 +#: ../src/printing.c:410 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "Pad van het huidige bestand volgen" -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Gewijzigd:" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, fuzzy, c-format msgid "Printing of file %s was cancelled." msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Bestand %s afgedrukt." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, fuzzy, c-format msgid "Printing of %s failed (%s)." msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." msgstr "" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3709,7 +3759,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, fuzzy, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Afdrukken van \"%s\" mislukt (foutcode: %d)." @@ -3729,150 +3779,150 @@ msgid "C_reate" msgstr "" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 #, fuzzy msgid "Filename:" msgstr "Vietnamees" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, fuzzy, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 #, fuzzy msgid "Open Project" msgstr "Make object" -#: ../src/project.c:292 +#: ../src/project.c:296 #, fuzzy msgid "Project files" msgstr "Eigenschappen" -#: ../src/project.c:326 +#: ../src/project.c:330 #, fuzzy, c-format msgid "Project \"%s\" closed." msgstr "Bestand %s gesloten." -#: ../src/project.c:408 +#: ../src/project.c:412 #, fuzzy msgid "Description:" msgstr "Sectie" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "" -#: ../src/project.c:448 +#: ../src/project.c:452 #, fuzzy msgid "Run command:" msgstr "Pint commando" -#: ../src/project.c:457 +#: ../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:472 +#: ../src/project.c:476 #, fuzzy msgid "File patterns:" msgstr "_Midden Oosten" -#: ../src/project.c:574 +#: ../src/project.c:578 #, fuzzy 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?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "" -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "" -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "" -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "" -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "" -#: ../src/project.c:657 +#: ../src/project.c:661 #, fuzzy, c-format msgid "The path \"%s\" does not exist." msgstr "Het bestand \"%s\" is niet geldig %s." -#: ../src/project.c:666 +#: ../src/project.c:670 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, fuzzy, c-format msgid "Project file could not be written (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "" -#: ../src/project.c:728 +#: ../src/project.c:732 #, fuzzy, c-format msgid "Project \"%s\" saved." msgstr "Bestand %s opgeslagen." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 #, fuzzy msgid "Choose Project Filename" msgstr "Eigenschappen" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "" -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Gebruik _reguliere expressies" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3880,16 +3930,16 @@ "Gebruik POSIX-achtige reguliere expressies. Voor gedetailleerde informatie " "over het gebruik van reguliere expressies, gelieve de documentatie te lezen." -#: ../src/search.c:212 +#: ../src/search.c:227 #, fuzzy msgid "Search _backwards" msgstr "_Achterwaarts zoeken" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Gebruik _escape sequences" -#: ../src/search.c:231 +#: ../src/search.c:246 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3898,436 +3948,445 @@ "Vervang \\\\, \\t, \\n, \\r en \\uXXXX (Unicode tekens) met de " "overeenkomende besturingstekens." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 #, fuzzy msgid "C_ase sensitive" msgstr "_Hoofdlettergevoelig" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Alleen op _volledig woord zoeken" -#: ../src/search.c:250 +#: ../src/search.c:265 #, fuzzy msgid "Match from s_tart of word" msgstr "Alleen op _volledig woord zoeken" -#: ../src/search.c:371 +#: ../src/search.c:386 #, fuzzy msgid "_Previous" msgstr "Zoek Vor_ige" -#: ../src/search.c:377 +#: ../src/search.c:392 #, fuzzy msgid "_Next" msgstr "V_olgende zoeken" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 #, fuzzy msgid "_Search for:" msgstr "Zoek naar:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 #, fuzzy msgid "_Find All" msgstr "Zoek" -#: ../src/search.c:416 +#: ../src/search.c:431 #, fuzzy msgid "_Mark" msgstr "Make" -#: ../src/search.c:418 +#: ../src/search.c:433 #, fuzzy msgid "Mark all matches in the current document" msgstr "Verwijdert alle markeringen in het huidige document." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 #, fuzzy msgid "In Sessi_on" msgstr "_In selectie" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 #, fuzzy msgid "_In Document" msgstr "_Document" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 #, fuzzy msgid "Close _dialog" msgstr "Alles sluiten" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "" -#: ../src/search.c:514 +#: ../src/search.c:529 #, fuzzy msgid "Replace & Fi_nd" msgstr "Vervangen met:" -#: ../src/search.c:523 +#: ../src/search.c:538 #, fuzzy msgid "Replace wit_h:" msgstr "Vervangen met:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 #, fuzzy msgid "Re_place All" msgstr "_Alles vervangen" -#: ../src/search.c:590 +#: ../src/search.c:605 #, fuzzy msgid "In Se_lection" msgstr "_In selectie" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "" "Vervang alle overeenkomsten die werden gevonden in de geselecteerde tekst" -#: ../src/search.c:681 +#: ../src/search.c:696 #, fuzzy msgid "_Directory:" msgstr "Map:" -#: ../src/search.c:712 +#: ../src/search.c:727 #, fuzzy msgid "E_ncoding:" msgstr "_Codering instellen" -#: ../src/search.c:737 +#: ../src/search.c:752 #, fuzzy msgid "Fixed s_trings" msgstr "_Herstelde strings" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Grep reguliere expressies" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 #, fuzzy msgid "See grep's manual page for more information" msgstr "Zie greps man-pagina voor meer informatie." -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Uitgebreide reguliere expressies" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "Zoekresultaten omkeren" -#: ../src/search.c:782 +#: ../src/search.c:797 #, fuzzy msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Keert de zoekresultaten om, zodoende enkel de niet-overeenkomende regels te " "selecteren" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 #, fuzzy, 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'" -#: ../src/search.c:1184 +#: ../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:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Ongeldige map voor zoeken in bestanden." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Geen tekst te vinden." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 #, fuzzy msgid "Searching..." msgstr "_Zoeken" -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, fuzzy, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s (in map: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Kon de map niet openen (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, fuzzy, 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." -#: ../src/search.c:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Geen overeenkomsten gevonden." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Hoofdstuk" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Sectie" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Appendix" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Andere" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 #, fuzzy msgid "Types" msgstr "Type" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 #, fuzzy msgid "Type constructors" msgstr "Woord vervolledigen" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Functies" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 #, fuzzy msgid "Sections" msgstr "Sectie" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Variabelen" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Commando" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Omgeving" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Subsectie" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Subsubsectie" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Label" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 #, fuzzy msgid "Structures" msgstr "Status" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Pakket" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Mijn" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Lokaal" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Onze" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 #, fuzzy msgid "Interfaces" msgstr "Interface" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Klassen" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 #, fuzzy msgid "ID Selectors" msgstr "_In selectie" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 #, fuzzy msgid "Type Selectors" msgstr "Woord vervolledigen" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Wezen" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Naamruimtes" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Eigenschappen" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Leden" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 #, fuzzy msgid "Labels" msgstr "Label" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Macro's" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 #, fuzzy msgid "Defines" msgstr "Lijn" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Naamruimtes" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 #, fuzzy msgid "Structs" msgstr "Status" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4335,117 +4394,103 @@ "gtk/gtk.h\n" msgstr "" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "" -#: ../src/symbols.c:1357 +#: ../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:1377 +#: ../src/symbols.c:1407 #, fuzzy, c-format msgid "Loaded %s tags file '%s'." msgstr "Kon pixmap bestand %s niet vinden" -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, fuzzy, c-format msgid "Could not load tags file '%s'." msgstr "Kon pixmap bestand %s niet vinden" -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, fuzzy, c-format msgid "Forward declaration \"%s\" not found." msgstr "Declaratie van \"%s()\" niet gevonden" -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, fuzzy, c-format msgid "Definition of \"%s\" not found." msgstr "Definitie van \"%s()\" niet gevonden" -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "Zoek" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "_Alles sluiten" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 #, fuzzy msgid "Sort by _Name" msgstr "Uiterlijk" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 #, fuzzy msgid "Sort by _Appearance" msgstr "Uiterlijk" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Huidig bestand opslaan" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "A_lles opslaan" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Alle geopende bestanden opslaan" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Huidig bestand van schijf herladen" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Huidig bestand sluiten" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 #, fuzzy msgid "Close all open files" msgstr "Sluit alle bestanden af" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 #, fuzzy msgid "Cut the current selection" msgstr "Converteert de hoofdletter van de huidige selectie" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 #, fuzzy msgid "Copy the current selection" msgstr "Huidig bestand compileren" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 #, fuzzy msgid "Delete the current selection" msgstr "Converteert de hoofdletter van de huidige selectie" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Laatste wijziging ongedaan maken" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Laatste wijziging herhalen" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Huidig bestand compileren" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Huidig bestand uitvoeren of weergeven" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" @@ -4453,66 +4498,88 @@ "Open een kleurkiesvenster, om interactief een kleur te kiezen uit een " "kleurpalet." -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Inzoomen" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Uitzoomen" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 #, fuzzy msgid "Decrease indentation" msgstr "Inspringing verkleinen" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 #, fuzzy msgid "Increase indentation" msgstr "Inspringing vergroten" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Zoek de aangegeven tekst in het huidig document" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 #, fuzzy msgid "Jump to the entered line number" msgstr "Ga naar het ingevoerde regelnummer" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Gean_y afsluiten" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "Volledig document" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Verwijdert alle markeringen in het huidige document." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Nieuw bestand aanmaken" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Bestaand bestand openen" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 #, fuzzy msgid "Goto" msgstr "Ga naar regel" +#: ../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 "Weergave" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4580,131 +4647,153 @@ msgid "Characters:" msgstr "Hoofdstuk" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Geen tags gevonden" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 #, fuzzy msgid "Show S_ymbol List" msgstr "Toon symbolenlijst" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 #, fuzzy msgid "Show _Document List" msgstr "Toon open bestanden lijst" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 #, fuzzy msgid "H_ide Sidebar" msgstr "Zijbalk verbergen" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Werkbalk weergeven" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "DEL" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "_Codering instellen" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "filetype: %s" msgstr "Bestandstype instellen:" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Lettertype gewijzigd (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C standaard bibliotheek" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C standaard bibliotheek" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ standaard bibliotheek" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 #, fuzzy msgid "_Set Custom Date Format" msgstr "Aangepast datumformaat instellen" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 #, fuzzy msgid "Select Folder" msgstr "Map selecteren" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 #, fuzzy msgid "Select File" msgstr "Alles selecteren" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 #, fuzzy msgid "C_onfiguration Files" msgstr "%s configuratiebestand, bewerk het inien nodig" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +#, fuzzy +msgid "Save All" +msgstr "A_lles opslaan" + +#: ../src/ui_utils.c:1786 #, fuzzy msgid "Close All" msgstr "_Alles sluiten" +#: ../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 "Terminal" @@ -4884,345 +4973,329 @@ "note, programs executed in VTE cannot be stopped" msgstr "" -#: ../src/win32.c:131 +#: ../src/win32.c:135 #, fuzzy msgid "Geany project files" msgstr "Eigenschappen" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Uitvoerbare" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Fout" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Vraag" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Informatie" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 #, fuzzy msgid "Class Builder" msgstr "Klassen" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "" -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 #, fuzzy msgid "Class" msgstr "Klassen" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 #, fuzzy msgid "Class name:" msgstr "Klassen" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 #, fuzzy msgid "Header file:" msgstr "Bestand herladen" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 #, fuzzy msgid "Source file:" msgstr "C bronbestand" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 #, fuzzy msgid "Inheritance" msgstr "Interface" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 #, fuzzy msgid "Base GType:" msgstr "Type" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 #, fuzzy msgid "Options" msgstr "Functies" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 #, fuzzy msgid "Create constructor" msgstr "Woord vervolledigen" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 #, fuzzy msgid "Create destructor" msgstr "Woord vervolledigen" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 #, fuzzy msgid "_C++ Class" msgstr "Klassen" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 #, fuzzy msgid "_GTK+ Class" msgstr "Klassen" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 #, fuzzy msgid "HTML Characters" msgstr "Hoofdstuk" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "" -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 +#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/splitwindow.c:37 #, fuzzy msgid "The Geany developer team" msgstr "De naam van de ontwikkelaar" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 #, fuzzy msgid "Special Characters" msgstr "Hoofdstuk" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 #, fuzzy msgid "_Insert" msgstr "Datum invoegen" -#: ../plugins/htmlchars.c:467 +#: ../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:481 +#: ../plugins/htmlchars.c:472 #, fuzzy msgid "Character" msgstr "Hoofdstuk" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "Tab plaatsing" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Plaatsing van nieuwe bestanden tabs:" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "Hoofdstuk" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 #, fuzzy msgid "Toggle plugin status" msgstr "Schakel regelcommentaar uit" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 #, fuzzy msgid "Exports the current file into different formats." msgstr "Compileert het huidig bestand in een DVI bestand" -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 #, fuzzy msgid "Export File" msgstr "Bestand openen" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "" -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, fuzzy, c-format msgid "File '%s' could not be written (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 #, fuzzy msgid "File Browser" msgstr "Browser" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "" -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 #, fuzzy msgid "_Find in Files" msgstr "Zoek in _bestanden" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 #, fuzzy msgid "Show _Hidden Files" msgstr "_Verborgen bestanden weergeven" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 #, fuzzy msgid "Set path from document" msgstr "Schakel naar linker document" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 #, fuzzy msgid "Clear the filter" msgstr "Huidig bestand sluiten" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 #, fuzzy msgid "Filter:" msgstr "_Bestand" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 #, fuzzy msgid "Plugin configuration directory could not be created." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." @@ -5259,7 +5332,7 @@ msgstr "" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "" #: ../plugins/filebrowser.c:1132 @@ -5268,32 +5341,32 @@ "Change the directory to the base directory of the currently opened project" msgstr "Huidig bestand opslaan" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 #, fuzzy msgid "Save Actions" msgstr "Sectie" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, fuzzy, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, fuzzy, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, fuzzy, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Configuratiemap kon niet worden aangemaakt (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5301,111 +5374,126 @@ msgstr[1] "" #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 #, fuzzy msgid "Select Directory" msgstr "Huidig bestand opslaan" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "" -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 #, fuzzy msgid "Auto Save" msgstr "Opslaan" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 #, fuzzy msgid "seconds" msgstr " commandos" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 #, fuzzy msgid "Save only current open _file" msgstr "Huidig bestand opslaan" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 #, fuzzy msgid "Sa_ve all open files" msgstr "Alle geopende bestanden opslaan" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 #, fuzzy msgid "Instant Save" msgstr "Datum invoegen" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 #, fuzzy msgid "_Filetype to use for newly opened files:" msgstr "Stelt de standaard codering in voor nieuw aangemaakte bestanden" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 #, fuzzy msgid "Splits the editor view into two windows." msgstr "Stelt het lettertype in voor de editorvensters" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Verwijdert alle markeringen in het huidige document." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:426 +#: ../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)" @@ -5813,10 +5901,6 @@ #~ msgid "Show open files list" #~ msgstr "Toon open bestanden lijst" -#, fuzzy -#~ msgid "Construct autocompletion" -#~ msgstr "Autovervollediging van constructies" - #~ msgid "Automatic completion of often used constructs like if and for" #~ msgstr "" #~ "Automatisch vervolledigen van veel gebruikte constructies zoals if en for" @@ -5839,10 +5923,6 @@ #~ msgid "Complete construct" #~ msgstr "Woord vervolledigen" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Autovervollediging onderdrukken" - #~ msgid "Go to tag definition" #~ msgstr "Ga naar tag definitie" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/pl.po /tmp/ssBwSf4GIv/geany-0.18/po/pl.po --- geany-0.17/po/pl.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/pl.po 2009-08-16 17:18:28.000000000 +0100 @@ -9,9 +9,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2007-09-26 21:22+0000\n" "Last-Translator: Jaroslaw Foksa \n" "Language-Team: polski \n" @@ -34,70 +34,70 @@ msgid "Integrated Development Environment" msgstr "Zintegrowane środowisko programistyczne" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "O programie" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "" "Geany - szybkie i lekkie\n" "środowisko programistyczne" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(kompilacja: %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Informacje" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Programiści" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "opiekun" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "programista" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "opiekun tłumaczeń" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Tłumacze" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Poprzedni tłumacze" -#: ../src/about.c:330 +#: ../src/about.c:332 #, fuzzy msgid "Contributors" msgstr "Konstruktory typów" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Zasługi" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licencja" -#: ../src/about.c:389 +#: ../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." @@ -105,7 +105,7 @@ "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:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -114,135 +114,135 @@ "Nie można odnaleźć terminala %s (sprawdź w ustawieniach ścieżkę do programu " "odpowiedzialnego za emulację terminala)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Proces zakończył działanie z niepowodzeniem (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (w katalogu %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Nie można zmienić katalogu bieżącego na \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Kompilacja nie powiodła się" -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Kompilacja została ukończona pomyślnie" #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Skompiluj" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Zbuduj _obiekt" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Następny błąd" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 #, fuzzy msgid "_Previous Error" msgstr "_Poprzedni" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "U_stawienia budowania i kompilacji " #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 #, fuzzy msgid "LaTeX -> _DVI" msgstr "LaTeX -> DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 #, fuzzy msgid "LaTeX -> _PDF" msgstr "LaTeX -> PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 #, fuzzy msgid "_View DVI File" msgstr "Wyświetl plik DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 #, fuzzy msgid "V_iew PDF File" msgstr "Wyświetl plik PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 #, fuzzy msgid "_Set Arguments" msgstr "Ustaw argumenty" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Ustaw argumenty" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Tworzenie DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Tworzenie PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Podgląd DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Podgląd PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -251,73 +251,73 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Ustaw pliki nagłówkowe i argumenty " -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Ustaw komendy odpowiedzialne za budowanie i uruchamianie programów" #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s poleceń" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Skompiluj:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Buduj:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Wykonaj:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 #, fuzzy msgid "Build the current file" msgstr "Kompiluje bieżący plik" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Zbuduj przy użyciu własnych parametrów" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Wprowadź tutaj swoje opcje, wpisany tutaj tekst jest przekazywany do " "polecenia make" -#: ../src/build.c:1976 +#: ../src/build.c:1967 #, 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" -#: ../src/build.c:1979 +#: ../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:1982 +#: ../src/build.c:1973 #, fuzzy msgid "Compile the current file with Make" msgstr "Kompiluje bieżący plik" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Nie udało się uruchomić programu wyświetlającego" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Proces nie może zostać zatrzymany(%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../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." @@ -325,8 +325,8 @@ msgid "Do you really want to quit?" msgstr " Czy na pewno chcesz zakończyć program? " -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "Wczytaj _ponownie" @@ -339,53 +339,53 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Czy na pewno chcesz czytać ponownie '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Przejdź do wiersza" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Wprowadź numer wiersza do którego chcesz przejść:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.rrrr" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.rrrr" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "rrrr/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.rrrr gg:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.rrrr gg:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "rrrr/mm/dd gg:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 #, fuzzy msgid "_Use Custom Date Format" msgstr "Użyj własnego formatu daty" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Własny format daty" -#: ../src/callbacks.c:1495 +#: ../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." @@ -393,24 +393,24 @@ "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:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Nie ma więcej komunikatów" #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Otwieranie pliku" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "P_okaż" -#: ../src/dialogs.c:150 +#: ../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." @@ -418,29 +418,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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Według rozszerzenia" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Według zawartości pliku" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "Opcje" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Wyświetlanie _ukrytych plików" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Ustaw kodowanie znaków" -#: ../src/dialogs.c:287 +#: ../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 " @@ -454,11 +454,11 @@ "kodowaniem." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Typ pliku:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -470,24 +470,32 @@ "Jeżeli wybierzesz kilka plików, określony typ zostanie zastosowany do " "wszystkich plików." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Zapisz plik" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Z_mień nazwę" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 #, fuzzy msgid "Save the file and rename it" msgstr "Zapisz plik i zmień jego nazwę." -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "O_twórz plik w nowej zakładce" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -495,24 +503,41 @@ msgstr "" "Otwórz plik w nowej zakładce (nie zamykaj bieżących niezapisanych plików)." -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Błąd" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Pytanie" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Ostrzeżenie" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informacja" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Nie zapisuj" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Plik %s nie został zapisany." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Czy chcesz go zapisać przed zamknięciem programu?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Wybór czcionki" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -520,106 +545,106 @@ "Wystąpił błąd lub pobieranie informacji o pliku nie powiodło się (czy plik " "został zapisany?)" -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "nieznany" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Właściwości" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Typ:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Rozmiar:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Położenie:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Tylko do odczytu:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(tylko wewnątrz Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Kodowanie:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(z BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(bez BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Ostatnia modyfikacja:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Ostatnia zmiana:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Ostatni dostęp:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Uprawnienia:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Odczyt:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Zapis:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Właściciel:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Grupa:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Inni:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Zamknięto plik %s." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Został otwarty nowy plik \"%s\"" -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Nie można otworzyć pliku %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -634,12 +659,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Plik \"%s\" nie istnieje %s" -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -648,50 +673,53 @@ "Plik \"%s\" nie jest plikiem tekstowym lub jego kodowanie nie jest " "obsługiwane." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Spacje" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Znaki tabulacji" -#: ../src/document.c:1174 +#: ../src/document.c:1128 #, 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:1179 +#: ../src/document.c:1133 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Automatyczne wcięcia" -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Niepoprawna nazwa pliku" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Wczytano ponownie plik %s." -#: ../src/document.c:1354 +#. 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 "Otwarto plik %s (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", tylko do odczytu" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "Błąd przy zapisywaniu pliku." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, fuzzy, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -701,59 +729,59 @@ "zapisany.\n" "Komunikat błędu: %s\n" -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, fuzzy, c-format msgid "Error message: %s." msgstr "Błąd przy zapisywaniu pliku (%s)." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Błąd przy zapisywaniu pliku." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Błąd przy zapisywaniu pliku (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Plik %s został zapisany." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" nie został znaleziony" -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Rozpocząć wyszukiwanie od początku pliku?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Nie znaleziono tekstu '%s'." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../src/document.c:2022 ../src/document.c:2031 #, 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:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Chcesz wczytać go ponownie?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -762,33 +790,21 @@ "Plik '%s' na dysku jest nowszy niż plik\n" "znajdujący się w bieżącym buforze." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, fuzzy, c-format msgid "File \"%s\" was not found on disk!" msgstr "\"%s\" nie został znaleziony" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 #, fuzzy msgid "Enter Tab Width" msgstr "Szerokość tabulacji" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" @@ -889,135 +905,124 @@ msgstr "Chińskie tradycyjne" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japońskie" -#: ../src/encodings.c:141 ../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 "Koreańskie" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Bez kodowania" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Zachodnioeuropejskie" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Wschodnioeuropejskie" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "_Południowoazjatyckie" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_Azja Płd.-Wsch. i Płd.-Zach." -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Bliskowschodnie" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Brak" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 +#: ../src/filetypes.c:237 ../src/filetypes.c:259 #, fuzzy, c-format msgid "%s source file" msgstr "C" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "C" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Brak" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Pliki skryptów powłoki" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Plik sterujący dla make" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 #, fuzzy msgid "Cascading StyleSheet" msgstr "Arkusz stylów CSS" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "Zrzut bazy SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Plik Diff" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Plik konfiguracyjny" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 #, fuzzy msgid "Gettext translation file" msgstr "opiekun tłumaczeń" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, fuzzy, c-format msgid "%s script file" msgstr "Pliki skryptów powłoki" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Plik reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Języki p_rogramowania" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Języki _skryptowe" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Języki _znacznikowe" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Róż_ne języki" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Wszystkie pliki źródłowe" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Wszystkie pliki" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "bez nazwy" @@ -1031,8 +1036,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "Niewidoczny" @@ -1040,7 +1045,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Otwórz wybrany pl_ik" @@ -1060,12 +1065,12 @@ msgid "Page Set_up" msgstr "" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 #, fuzzy msgid "Close Ot_her Documents" msgstr "Zamyka bieżący plik" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Zamknij wszystk_o" @@ -1073,90 +1078,86 @@ msgid "_Edit" msgstr "_Edycja" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Z_aznacz wszystko" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Odwróć w_ielkość zaznaczonych liter" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Komentuj linie" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "_Odkomentuj linie" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "P_rzełącz komentowanie linii" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Z_większ wcięcie" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Z_mniejsz wcięcie" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "_Wyślij zaznaczenie do" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Wyślij zaznaczenie do" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "W_staw komentarze" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Wstawia wpis pliku dziennika (ChangeLog)" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 #, fuzzy msgid "Insert File _Header" msgstr "Wstaw nagłówek pliku" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 #, fuzzy msgid "Insert _Function Description" msgstr "Wstaw opis funkcji" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Wstaw długi komentarz" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 #, fuzzy msgid "Insert _GPL Notice" msgstr "Wstaw informację o licencji GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 #, fuzzy msgid "Insert _BSD License Notice" msgstr "Wstaw informację o licencji _BSD" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Wstaw _datę" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Wstaw \"_include <...>\"" @@ -1181,7 +1182,7 @@ msgid "Find in F_iles" msgstr "Znajdź w _plikach" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Z_astąp" @@ -1203,7 +1204,7 @@ msgid "Pr_evious Message" msgstr "Następny komunikat" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Przejdź _do wiersza" @@ -1232,7 +1233,7 @@ msgid "Show Side_bar" msgstr "Panel _boczny" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Edytor" @@ -1281,17 +1282,17 @@ msgid "In_dent Type" msgstr "" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 #, fuzzy msgid "_Tabs" msgstr "Znaki tabulacji" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 #, fuzzy msgid "_Spaces" msgstr "Spacje" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 #, fuzzy msgid "T_abs and Spaces" msgstr "Zamień znaki tabulacji na _spacje" @@ -1416,7 +1417,7 @@ msgid "_Debug Messages" msgstr "Komunikaty" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Symbole" @@ -1441,85 +1442,90 @@ msgid "Scribble" msgstr "Brudnopis" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 #, fuzzy msgid "Images _and Text" msgstr "Napisy i ikony" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 #, fuzzy msgid "_Images Only" msgstr "Tylko ikony" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 #, fuzzy msgid "_Text Only" msgstr "Tylko napisy" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 #, fuzzy msgid "_Large Icons" msgstr "Duże ikony" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 #, fuzzy msgid "_Small Icons" msgstr "Małe ikony" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "Małe ikony" -#: ../src/interface.c:1770 +#: ../src/interface.c:1769 #, fuzzy -msgid "_Hide toolbar" +msgid "_Customize Toolbar" msgstr "Ukryj pasek narzędzi" -#: ../src/interface.c:2082 +#: ../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:2090 +#: ../src/interface.c:2102 #, fuzzy msgid "Find _Document Usage" msgstr "Znajdź" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 #, fuzzy msgid "Go to _Tag Definition" msgstr "Przejdź do definicji znacznika" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 #, fuzzy msgid "Go to T_ag Declaration" msgstr "Przejdź do deklaracji znacznika" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 #, fuzzy msgid "Conte_xt Action" msgstr "Akcja kontekstowa" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Ustawienia" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Wczytywanie plików z ostatniej sesji" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "" "Przy uruchomieniu programu zostaną otwarte wszystkie pliki z poprzedniej " "sesji" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Wsparcie dla wirtualnego terminala" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1528,42 +1534,42 @@ "Określa, czy wirtualny terminal powinien być uruchamiany przy starcie " "programu. Odznacz tę opcję, jeżeli go nie potrzebujesz." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Obsługa wtyczek" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 #, fuzzy msgid "Startup" msgstr "Panel boczny" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Zapisywanie pozycji i wymiarów okna" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Potwierdzanie zakończenia programu" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Wyświetla okno dialogowe potwierdzenia przy zamykaniu programu" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 #, fuzzy msgid "Shutdown" msgstr "Uruchamianie i wylączanie" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Katalog początkowy:" -#: ../src/interface.c:2758 +#: ../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." @@ -1571,42 +1577,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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Katalog z plikami projektu" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 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:2796 +#: ../src/interface.c:2816 #, fuzzy msgid "Extra plugin path:" msgstr "Obsługa wtyczek" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Katalogi" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 #, fuzzy msgid "Startup" msgstr "Status" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 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:2851 +#: ../src/interface.c:2871 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1615,13 +1621,13 @@ "Uruchamia sygnał dźwiękowy przy wystąpieniu błędów lub po zakończeniu " "procesu kompilacji" -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 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:2856 +#: ../src/interface.c:2876 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1631,11 +1637,11 @@ "pojawi się nowy komunikat dotyczący statusu (np. zapis pliku, szukanie ciągu " "znaków, itp.)" -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Ukryj informacje statusu na pasku statusu" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1643,11 +1649,12 @@ "Usuwa wszystkie informacje na pasku statusu. Informacje są jednak nadal " "dostępne w oknie z informacjami o statusie." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Automatycznie aktywuj panele po najechaniu kursorem" -#: ../src/interface.c:2866 +#: ../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 " @@ -1657,15 +1664,15 @@ "głównego okna edytora, pola wyszukiwania, pola skoku do wiersza i " "wbudowanego emulatora terminala." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Różne" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Zapętlanie wyszukiwanie i ukrywanie okna dialogowego wyszukiwania" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1675,43 +1682,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:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2896 +#: ../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:2898 +#: ../src/interface.c:2918 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Nieprawidłowy katalog." -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 #, fuzzy msgid "Search" msgstr "Panel boczny" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 #, fuzzy msgid "Use project-based session files" msgstr "Pliki projektów Geany" -#: ../src/interface.c:2924 +#: ../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:2926 +#: ../src/interface.c:2946 #, fuzzy msgid "Store project file inside the project base directory" msgstr "Utworzyć katalog podstawowy dla projektu?" -#: ../src/interface.c:2929 +#: ../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 " @@ -1719,79 +1726,79 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 #, fuzzy msgid "Projects" msgstr "Katalogi" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 #, fuzzy msgid "Miscellaneous" msgstr "Różne" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Ogólne" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Wyświetlanie listy symboli" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Wyświetla lub ukrywa listę symboli" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 #, fuzzy msgid "Show documents list" msgstr "Wyświetlanie listy otwartych plików" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 #, fuzzy msgid "Toggle the documents list on and off" msgstr "Wyświetla lub ukrywa listę otwartych plików" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Panel boczny" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Lista symboli:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Okno komunikatów:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Edytor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Ustawia czcionkę dla okna komunikatów" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Ustawia czcionkę dla listy symboli" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Ustawia czcionkę edytora" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Czcionki" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Wyświetlanie zakładek edytora" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Wyświetlanie przycisków zamykania na zakładkach" -#: ../src/interface.c:3064 +#: ../src/interface.c:3084 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1801,109 +1808,114 @@ "szybkie zamykanie plików (po zmianie tej opcji należy ponownie uruchomić " "Geany aby zadziałała)." -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Położenie nowych zakładek plików:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Lewo" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Prawo" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Włącz/Wyłącz tryb minimalistyczny" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Przełącz wszystkie dodatkowe panele" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Zakładki edytora" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Góra" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Dół" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Panel boczny" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Położenie elementów interfejsu:" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Wyświetlanie paska statusu" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 #, 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interfejs" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "Wyświetlanie paska narzędzi" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Pasek narzędzi" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Styl ikon" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Rozmiar ikon" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Wygląd" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Pasek _narzędzi" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Pasek narzędzi" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Zawijanie wierszy" -#: ../src/interface.c:3349 +#: ../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 " @@ -1913,11 +1925,11 @@ "przypadku dużych dokumentów może być zasobochłonne (tj. spowalniać działanie " "programu) na starszych starszych komputerach." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "\"Inteligentny\" klawisz Home" -#: ../src/interface.c:3354 +#: ../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 " @@ -1931,11 +1943,11 @@ "wyłączona, klawisz HOME zawsze przesuwa karetkę na początek wiersza, " "niezależnie od bieżącej pozycji." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Wyłączenie przeciągania i upuszczania" -#: ../src/interface.c:3359 +#: ../src/interface.c:3403 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1945,30 +1957,30 @@ "przeciąganie i upuszczanie dowolnego zaznaczenia wewnątrz lub na zewnątrz " "okna edytora." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Zwijanie sekcji kodu" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Określa czy włączyć zawijanie sekcji kodu" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Rozwijanie potomne punktów zwinięcia" -#: ../src/interface.c:3369 +#: ../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 "" -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Podkreślanie miejsc, w których wystąpiły błędy kompilacji" -#: ../src/interface.c:3374 +#: ../src/interface.c:3418 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1977,157 +1989,156 @@ "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:3376 +#: ../src/interface.c:3420 #, fuzzy msgid "Newline strips trailing spaces" msgstr "Usuwanie spacji i znaków tabulacji na końcach linii" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 #, fuzzy msgid "Line breaking column:" msgstr "Zawijanie wierszy" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 #, fuzzy msgid "Comment toggle marker:" msgstr "Przełącz znacznik" -#: ../src/interface.c:3406 +#: ../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 "" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Opcje" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 #, fuzzy msgid "Features" msgstr "Opcje" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 #, fuzzy msgid "Auto-indent mode:" msgstr "Automatyczne wcięcia" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Podstawowe" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Bieżące znaki" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Idź do nawiasu zamykającego/otwierającego" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 #, fuzzy msgid "Width:" msgstr "Zapis:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 #, fuzzy msgid "The width in chars of a single indent" msgstr "" "Szerokość znaku tabulacji wyrażona szerokością jednego znaku standardowego" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 #, fuzzy msgid "Hard tab width:" msgstr "Szerokość tabulacji" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 #, fuzzy msgid "Tab key indents" msgstr "Inteligentne wcięcia wierszy" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Wcięcie" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 #, fuzzy msgid "Indentation" msgstr "Wcięcie" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 #, fuzzy msgid "Snippet completion" msgstr "Automatyczne uzupełnianie konstrukcji" -#: ../src/interface.c:3581 +#: ../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:3583 +#: ../src/interface.c:3627 #, fuzzy -msgid "XML tag auto completion" +msgid "XML tag autocompletion" msgstr "Automatyczne uzupełnianie znaczników XML i HTML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 #, 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:3588 +#: ../src/interface.c:3632 #, fuzzy msgid "Automatic continuation of multi-line comments" msgstr "Wstawia komentarz dłuższy niż jedna linia" -#: ../src/interface.c:3591 +#: ../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 "" -#: ../src/interface.c:3593 -#, fuzzy -msgid "Automatic symbol completion" -msgstr "Automatyczne uzupełnianie wyrażeń" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2135,143 +2146,153 @@ "Automatyczne uzupełnianie wyrażeń występujących w otwartych plikach (np. " "nazw funkcji, zmiennych globalnych, itp.) " -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "" + +#: ../src/interface.c:3646 +#, fuzzy +msgid "Drop rest of word on completion" +msgstr "Automatyczne uzupełnianie konstrukcji" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" +msgstr "_Automatyczne uzupełnianie pętli" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3692 #, fuzzy -msgid "Display height in rows for the auto completion list" +msgid "Display height in rows for the autocompletion list" msgstr "Liczba wierszy wyświetlanych przez listę autouzupełniania" -#: ../src/interface.c:3649 +#: ../src/interface.c:3701 #, fuzzy -msgid "Maximum number of entries to display in the auto completion list" +msgid "Maximum number of entries to display in the autocompletion list" msgstr "Liczba wierszy wyświetlanych przez listę autouzupełniania" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 #, fuzzy msgid "Completions" msgstr "Automatyczne uzupełnianie" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 #, fuzzy msgid "Completions" msgstr "Automatyczne uzupełnianie" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Odwróć kolory podświetlania składni" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Wyświetlanie prowadnic" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 #, 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Wyświetlanie ukrytych znaków" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Oznacza spacje za pomocą kropek, a znaki tabulacji strzałkami" -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Wyświetlanie znaków końca wiersza" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "Włącza wyświetlanie znaków końca wiersza" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 #, fuzzy msgid "Show line numbers" msgstr "_Numery wierszy" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Wyświetla lub ukrywa numerowanie wierszy na marginesie." -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 #, fuzzy msgid "Show markers margin" msgstr "Mar_gines ze znacznikami" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2280,37 +2301,37 @@ "Pokazuje lub ukrywa mały margines po prawej stronie pola z numerami wierszy, " "który umożliwia zaznaczanie wierszy" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 #, fuzzy msgid "Stop scrolling at last line" msgstr "Przewiń do bieżącej linii" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Wyświetlanie" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Znacznik długiej linii" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Kolor znacznika długiej linii" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Ustawia kolor znacznika długiej linii" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Wybór koloru" -#: ../src/interface.c:3826 +#: ../src/interface.c:3878 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2322,11 +2343,11 @@ "dzieleniu zbyt długich wierszy. Podaj liczbę znaków w poziomie, jaką ma " "wydzielać ta linia." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Wiersz" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2335,69 +2356,69 @@ "Wyświetla pionową linię w oknie edytora w określonej pozycji kursora (patrz " "poniżej)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Tło" -#: ../src/interface.c:3846 +#: ../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 "" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Brak" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Znacznik długiej linii" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Wyświetlanie" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 #, fuzzy msgid "Default end of line characters:" msgstr "Domyślne kodowanie (dla nowych plików):" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Nowe pliki" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Domyślne kodowanie (dla nowych plików):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Domyślne kodowanie (dla istniejących plików):" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "Ustaw domyślne kodowanie dla otwieranych plików." -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Używaj określonego kodowania dla otwieranych plików" -#: ../src/interface.c:3978 +#: ../src/interface.c:4030 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " @@ -2407,81 +2428,81 @@ "Ta opcja wyłącza automatyczne wykrywanie kodowania przy otwieraniu plików, " "zamiast tego pliki będą otwierane z określonym kodowaniem." -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 #, fuzzy msgid "Encodings" msgstr "Kodowanie:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Nowa linia na końcu pliku" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Usuwanie spacji i znaków tabulacji na końcach linii" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Usuwa spacje i znaki tabulacji na końcu linii" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Zamiana tabulacji na spacje" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Zamienia wszystkie znaki tabulacji na spacje." -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Zapis plików" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Rozmiar listy ostatnio używanych plików:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 #, 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Pliki" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Program Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Przeglądarka:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Ścieżka i opcje dla narzędzia make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2489,25 +2510,25 @@ "Emulacja terminala takiego jak xterm, gnome-terminal czy konsole (powinien " "akceptować argument -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 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:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Program Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Ścieżki do narzędzi" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Akcja kontekstowa:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2518,69 +2539,69 @@ "połączeniu z %s. Może pojawić się w dowolnym miejscu podanego polecenia i " "zostanie zamienione przed jego wykonaniem." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Polecenia" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Narzędzia" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "adres e-mail programisty" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Inicjały programisty" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Wstępna wersja:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Numer wersji" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Nazwa firmy" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Programista:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Adres e-mail:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Inicjały:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Nazwisko programisty" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 #, fuzzy msgid "Year:" msgstr "Panel boczny" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 #, fuzzy msgid "Date:" msgstr "Program Make:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4382 +#: ../src/interface.c:4434 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2589,7 +2610,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:4389 +#: ../src/interface.c:4441 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2598,7 +2619,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:4396 +#: ../src/interface.c:4448 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2607,89 +2628,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:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Dane szablonu" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Szablony" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "Zmi_eń" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Skróty klawiszowe" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Skróty klawiszowe" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 #, fuzzy msgid "Command:" msgstr "Polecenie" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 #, fuzzy msgid "Print line numbers" msgstr "_Numery wierszy" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Podążanie za ścieżką do bieżącego pliku" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 #, fuzzy msgid "Print page numbers" msgstr "_Numery wierszy" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "" -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 #, fuzzy msgid "Print page header" msgstr "Nagłówek podstawowy" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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 "" -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 #, fuzzy msgid "Use the basename of the printed file" msgstr "Podążanie za ścieżką do bieżącego pliku" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 #, 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 #, fuzzy msgid "Date format:" msgstr "Własny format daty" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../src/interface.c:4608 ../src/printing.c:422 #, fuzzy msgid "" "Specify a format for the date and time stamp which is added to the page " @@ -2699,568 +2720,587 @@ "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:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 #, fuzzy msgid "Printing" msgstr "Wydrukuj" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Właściwości projektu" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 #, fuzzy msgid "File" msgstr "_Plik" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nowy" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Otwórz" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Otwórz wybrany plik" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Zapisz" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Zapisz jako" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Zapisz wszystko" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Wydrukuj" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Zamknij" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Zamknij wszystko" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Wczytaj plik ponownie" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 #, fuzzy msgid "Project" msgstr "P_rojekt" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Właściwości projektu" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Cofnij" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Ponowienie" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Duplikuj wiersz albo zaznaczenie" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Usuń bieżącą linię" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, 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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Przewiń do bieżącej linii" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Przewiń widok o jedną linię w górę" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Przesuń widok o jedną linię w dół" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 #, fuzzy msgid "Complete snippet" msgstr "Zatwierdź sugerowane uzupełnienie konstrukcji" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 #, fuzzy msgid "Suppress snippet completion" msgstr "Automatyczne uzupełnianie konstrukcji" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Akcja kontekstowa" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Całe słowo" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Pokaż podpowiedzi" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Pokaż listę makr" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 #, fuzzy msgid "Copy" msgstr "Firma:" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Kopiuje bieżącą linię" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Wycina bieżącą linię" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 #, fuzzy msgid "Select" msgstr "Zaznacz wszystko" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Zaznacz wszystko" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Zaznacz bieżące słowo" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Zaznacz bieżący wiersz" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Zaznacz bieżący akapit" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 #, fuzzy msgid "Format" msgstr "_Format" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Przełącz rozmiar dla zaznaczenia" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Przełącz komentowanie linii" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Komentuj linie" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Odkomentuj linie" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Zwiększ wcięcie" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Zmniejsz wcięcie" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Zwiększ wcięcie o jedną spację" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Zmniejsz wcięcie o jedną spację" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Inteligentne wcięcia wierszy" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Wyślij do zewnętrznego polecenia 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Wyślij do zewnętrznego polecenia 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Wyślij do zewnętrznego polecenia 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "_Wyślij zaznaczenie do" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 #, fuzzy msgid "Insert" msgstr "Ws_taw" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Wstaw datę" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 #, fuzzy msgid "Insert alternative white space" msgstr "Wstaw alternatywną wolną przestrzeń" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 #, fuzzy msgid "Settings" msgstr "Sekcje" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 #, fuzzy msgid "Search" msgstr "_Szukaj" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Szukaj" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Znajdź następny" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Znajdź poprzedni" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Znajdź następne zaznaczenie" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Znajdź poprzednie zaznaczenie" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Zastąp" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Znajdź w _plikach" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Następny komunikat" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 #, fuzzy msgid "Previous Message" msgstr "Następny komunikat" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Znajdź" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 #, fuzzy msgid "Find Document Usage" msgstr "Znajdź" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Zbuduj _wszystko" + +#: ../src/keybindings.c:369 #, fuzzy msgid "Go to" msgstr "Przejdź do wiersza" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Przejdź do poprzedniej lokacji" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Przejdź do następnej lokacji" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Idź do nawiasu zamykającego/otwierającego" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Przełącz znacznik" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Idź do następnego znacznika" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Idź do poprzedniego znacznika" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Przejdź do definicji znacznika" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Przejdź do deklaracji znacznika" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 #, fuzzy msgid "Go to Start of Line" msgstr "Przejdź do wiersza" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 #, fuzzy msgid "Go to End of Line" msgstr "Przejdź do wiersza" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Przejdź do wiersza" + +#: ../src/keybindings.c:400 #, fuzzy msgid "Go to Previous Word Part" msgstr "Idź do poprzedniego znacznika" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 #, fuzzy msgid "Go to Next Word Part" msgstr "Idź do następnego znacznika" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 #, fuzzy msgid "View" msgstr "P_okaż" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Przełącz wszystkie dodatkowe panele" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Pełny _ekran" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Przełącz okno komunikatów" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Przełącz panel boczny" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Powiększ" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Pomniejsz" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Przejdź do edytora" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Przejdź do Scribble" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Przejdź do terminala" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Przejdź do paska wyszukiwania" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 #, fuzzy msgid "Switch to Sidebar" msgstr "Przejdź do paska wyszukiwania" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 #, fuzzy msgid "Switch to Compiler" msgstr "Przejdź do paska wyszukiwania" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 #, fuzzy msgid "Notebook tab" msgstr "Polecenia składni" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Przejdź do lewego dokumentu" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Przejdź do prawego dokumentu" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Przejdź do ostatnio używanego dokumentu" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Przesuń dokument w lewo" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Przesuń dokument w prawo" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 #, fuzzy msgid "Move document first" msgstr "Przesuń dokument w lewo" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 #, fuzzy msgid "Move document last" msgstr "Przesuń dokument w lewo" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 #, fuzzy msgid "Document" msgstr "_Dokument" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 #, fuzzy msgid "Toggle Line wrapping" msgstr "Zawijanie wierszy" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 #, fuzzy msgid "Toggle Line breaking" msgstr "P_rzełącz komentowanie linii" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 #, fuzzy msgid "Replace spaces by tabs" msgstr "Zamień znaki tabulacji na _spacje" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 #, fuzzy msgid "Toggle current fold" msgstr "Zaznacz bieżące słowo" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Zwiń wszystkie" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Rozwiń wszystkie" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Wczytaj ponownie listę symboli" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Buduj" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Skompiluj" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Zbuduj wszystko" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Zbuduj przy użyciu własnych parametrów" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Zbuduj obiekt" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Następny błąd" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 #, fuzzy msgid "Previous error" msgstr "Poprzedni tłumacze" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Uruchom" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Uruchom (polecenie alternatywne)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Opcje budowania" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Przycisk wyboru kolorów" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Pomoc" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Skróty klawiszowe" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Poniższe skróty klawiszowe są konfigurowalne:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 #, fuzzy msgid "Switch to Document" msgstr "Przejdź do lewego dokumentu" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Wczytywanie jednego lub więcej plików sesji zakończone niepowodzeniem." -#: ../src/log.c:177 +#: ../src/log.c:181 #, fuzzy msgid "Debug Messages" msgstr "Komunikaty" @@ -3320,8 +3360,8 @@ msgstr "" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "nie wczytuj plików z poprzedniej sesji" +msgid "Don't load the previous session's files" +msgstr "Nie wczytuj plików z poprzedniej sesji" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3335,24 +3375,24 @@ msgid "Show version and exit" msgstr "Wyświetl informacje o wersji i zakończ program" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[PLIKI...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3361,14 +3401,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3379,22 +3419,22 @@ "Geany może nie działać poprawnie bez swojego katalogu z konfiguracją.\n" "Uruchomić program pomimo tego?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Używasz Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 #, fuzzy msgid "Configuration files reloaded." msgstr "Kompilacja nie powiodła się" @@ -3412,18 +3452,18 @@ msgid "_Hide Message Window" msgstr "_Ukryj okno komunikatów" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3431,61 +3471,71 @@ "Author(s): %s" msgstr "" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 #, fuzzy msgid "Active" msgstr "Działanie" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "" -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "" -#: ../src/plugins.c:1263 +#: ../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:1276 +#: ../src/plugins.c:1263 #, fuzzy msgid "Plugin details:" msgstr "Wcięcie" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Działanie" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Skrót" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Przechwyć klawisz" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +#, fuzzy +msgid "_Expand All" +msgstr "Szukaj wszystkie" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +#, fuzzy +msgid "_Collapse All" +msgstr "Zamknij wszystk_o" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Działanie" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Skrót" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, fuzzy, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" @@ -3494,14 +3544,14 @@ #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3509,7 +3559,7 @@ "Ustaw informacje wykorzystywane przez szablony. Więcej informacji na ten " "temat znajduje się w dokumentacji." -#: ../src/prefs.c:1458 +#: ../src/prefs.c:1523 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3520,7 +3570,7 @@ "i>" #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3531,66 +3581,67 @@ "skrót klawiszowy." #. page Printing -#: ../src/prefs.c:1469 +#: ../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 "" -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -#: ../src/printing.c:270 +#: ../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 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Ostatnia zmiana:" -#: ../src/printing.c:340 +#: ../src/printing.c:375 #, fuzzy msgid "Document Setup" msgstr "Menu Dokument" -#: ../src/printing.c:375 +#: ../src/printing.c:410 #, 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:491 +#: ../src/printing.c:526 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Ostatnia zmiana:" -#: ../src/printing.c:741 +#: ../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:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Wydrukowano plik %s." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, fuzzy, c-format msgid "Printing of %s failed (%s)." msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (zwrócony kod: %s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." msgstr "" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3601,7 +3652,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Drukowanie \"%s\" zakończone niepowodzeniem (zwrócony kod: %s)." @@ -3620,19 +3671,19 @@ msgid "C_reate" msgstr "Utwó_rz" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nazwa:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Nazwa pliku:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Katalog podstawowy" -#: ../src/project.c:171 ../src/project.c:434 +#: ../src/project.c:171 ../src/project.c:438 #, fuzzy msgid "" "Base directory of all files that make up the project. This can be a new " @@ -3642,41 +3693,41 @@ "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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Wybierz katalog podstawowy dla projektu" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Plik projektu \"%s\" nie mógł zostać wczytany." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Otwórz projekt" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Katalog z plikami projektu" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt \"%s\" został zamknięty." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Opis:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Wykonaj polecenie:" -#: ../src/project.c:457 +#: ../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." @@ -3685,81 +3736,81 @@ "Polecenie może zawierać dodatkowe opcje. Pozostaw to pole puste aby używać " "domyślne polecenie." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Wzory plików:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Czy chcesz go zamknąć przed kontynuowaniem?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, fuzzy, c-format msgid "The '%s' project is already open." msgstr "Projekt '%s' jest już otwarty" -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Podana nazwa projektu jest za krótka" -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Podałeś niewłaściwą nazwę pliku projektu." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Utworzyć katalog podstawowy dla projektu?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Katalog \"%s\" nie istnieje." -#: ../src/project.c:666 +#: ../src/project.c:670 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, fuzzy, c-format msgid "Project file could not be written (%s)." msgstr "Plik projektu nie mógł zostać odczytany." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Projekt \"%s\" utworzony." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt \"%s\" zapisany." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Wybierz nazwę pliku projektu" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../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:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt \"%s\" otwarty" -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Użycie wyrażeń _regularnych" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3767,15 +3818,15 @@ "Używaj wyrażeń regularnych w stylu POSIX. Więcej informacji na ten temat " "znajduje się w dokumentacji." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Wyszukiwanie _wstecz" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Uż_ycie sekwencji specjalnych" -#: ../src/search.c:231 +#: ../src/search.c:246 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3784,415 +3835,425 @@ "Zastąp \\\\, \\t, \\n, \\r oraz \\uXXXX (znaki Unicode) odpowiednimi znakami " "kontrolnymi." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Rozróżnianie wielkości _liter" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Tylko całe _wyrazy" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Tylko wyrazy o takich samych _początkach" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Poprzedni" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Następny" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Szukaj:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 #, fuzzy msgid "_Find All" msgstr "Szukaj wszystkie" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "Ust_aw znaczniki" -#: ../src/search.c:418 +#: ../src/search.c:433 #, 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:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "W _sesji" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "_W dokumencie" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "_Zamknij po ustawieniu znaczników" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Zamyka okno po ustawieniu znaczników" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Za_stąp i znajdź" -#: ../src/search.c:523 +#: ../src/search.c:538 #, fuzzy msgid "Replace wit_h:" msgstr "Za_stąp ciągiem:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 #, fuzzy msgid "Re_place All" msgstr "Zastąp wszystkie" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "W _zaznaczeniu" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Zamieć wszystkie ciągi znalezione w aktualnie zaznaczonym tekście" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "Ka_talog:" -#: ../src/search.c:712 +#: ../src/search.c:727 #, fuzzy msgid "E_ncoding:" msgstr "Ustaw kodowanie znaków" -#: ../src/search.c:737 +#: ../src/search.c:752 #, fuzzy msgid "Fixed s_trings" msgstr "Stałe _ciągi" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Wyrażenia regularne _Grep" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 #, fuzzy msgid "See grep's manual page for more information" msgstr "Zobacz podręcznik programu Grep aby uzyskać więcej informacji." -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Rozszerzone wyrażenia regularne" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Szukaj w _podkatalogach" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Odwróć wyniki wyszukiwania" -#: ../src/search.c:782 +#: ../src/search.c:797 #, 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:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Opcje _dodatkowe:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Inne opcje przekazywane programowi Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 #, 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:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Nieprawidłowy katalog." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Nie znaleziono tekstu" -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 #, fuzzy msgid "Searching..." msgstr "_Szukaj" -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (w katalogu: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Nie można otworzyć katalogu %s" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Nie znaleziono ciągu." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Rozdział" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Sekcja" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sekcja1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sekcja2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sekcja3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Dodatek" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Inne" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Moduł" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Typy:" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Konstruktory typów" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Funkcje" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Sekcje" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Przyciski" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Zmienne" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Polecenie" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Środowisko" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Podsekcja" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Podsekcja" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Etykieta" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 #, fuzzy msgid "Structures" msgstr "Status" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Pakiet" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Moje" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Lokalny" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Nasze" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfejsy" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Klasy" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Stałe" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 #, fuzzy msgid "ID Selectors" msgstr "W _zaznaczeniu" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 #, fuzzy msgid "Type Selectors" msgstr "Konstruktory typów" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Modules" msgstr "Moduł" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Wzorce singletonu" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Metody" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Przestrzenie nazw" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Właściwości" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Eksportuj" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Atrybuty/metody w klasach" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 #, fuzzy msgid "Labels" msgstr "Etykieta" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Makra" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 #, fuzzy msgid "Defines" msgstr "Wiersze:" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Przestrzenie nazw" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 #, fuzzy msgid "Structs" msgstr "Status" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Nieznane rozszerzenie pliku dla \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4201,7 +4262,7 @@ "Użycie: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4212,117 +4273,103 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Wczytaj znaczniki" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Wczytano %s pliku ze znacznikami %s" -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Nie można wczytać pliku ze znacznikami: %s" -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Nie odnaleziono deklaracji \"%s\"" -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Brak Definicji \"%s\"" -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "Szukaj wszystkie" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "Zamknij wszystk_o" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 #, fuzzy msgid "Sort by _Name" msgstr "Uporządkuj według nazw" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 #, fuzzy msgid "Sort by _Appearance" msgstr "Uporządkuj według kolejności wystąpienia" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Zapisuje bieżący plik" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "Za_pisz wszystko" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Zapisuje wszystkie otwarte pliki" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Ponownie wczytuje bieżący plik z dysku" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Zamyka bieżący plik" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 #, fuzzy msgid "Close all open files" msgstr "Zamyka wszystkie otwarte pliki" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 #, fuzzy msgid "Cut the current selection" msgstr "Konwertuj zaznaczone znaki do małych/dużych liter" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 #, fuzzy msgid "Copy the current selection" msgstr "Kompiluje bieżący plik" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 #, fuzzy msgid "Delete the current selection" msgstr "Konwertuj zaznaczone znaki do małych/dużych liter" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Cofnij ostatnią modyfikację" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Ponów ostatnią modyfikację" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Kompiluje bieżący plik" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Uruchamia lub włącza podgląd bieżącego pliku" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" @@ -4330,66 +4377,90 @@ "Otwiera okno dialogowe wyboru kolorów, które umożliwia wybór koloru w sposób " "interaktywny z palety" -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Powiększa tekst" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Zmniejsza tekst" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 #, fuzzy msgid "Decrease indentation" msgstr "Zmniejsz wcięcie" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 #, fuzzy msgid "Increase indentation" msgstr "Zwiększ wcięcie" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Szuka podanego tekstu w bieżącym pliku" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 #, fuzzy msgid "Jump to the entered line number" msgstr "Przechodzi do podanego numeru wiersza." -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Zamknij Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "XML" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." +#: ../src/toolbar.c:80 +#, 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:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Tworzy nowy plik" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Otwiera plik" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 #, fuzzy msgid "Goto" msgstr "Przejdź do wiersza" +#: ../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 "Wyświetlanie" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4455,129 +4526,151 @@ msgid "Characters:" msgstr "Znaki:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Nie znaleziono" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 #, fuzzy msgid "Show S_ymbol List" msgstr "Wyświetlanie listy symboli" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 #, fuzzy msgid "Show _Document List" msgstr "Wyświetlanie listy otwartych plików" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 #, fuzzy msgid "H_ide Sidebar" msgstr "Ukryj panel boczny" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Wyświetlanie paska statusu" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "NDP" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "WST" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "Ustaw kodowanie znaków" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "filetype: %s" msgstr "Typ pliku:" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Zaktualizowano czcionkę (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Standardowa biblioteka C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Standardowa biblioteka C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Standardowa biblioteka C++" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 #, fuzzy msgid "_Set Custom Date Format" msgstr "Ustaw własny format daty" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Wybierz katalog" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Wybierz plik" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 #, fuzzy msgid "C_onfiguration Files" msgstr "Kompilacja nie powiodła się" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +#, fuzzy +msgid "Save All" +msgstr "Za_pisz wszystko" + +#: ../src/ui_utils.c:1786 #, fuzzy msgid "Close All" msgstr "Zamknij wszystk_o" +#: ../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 "Terminal" @@ -4758,164 +4851,148 @@ "programu Geany) zamiast otwierać nowe osobne okno z terminalalem. Programy " "uruchamiane we wbudowanym oknie nie mogą być zatrzymywane." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Pliki projektów Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Pliki wykonywalne" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Błąd" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Pytanie" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Ostrzeżenie" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Informacja" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Konstruktor klasy" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Tworzy pliki źródłowe dla nowych typów klas" -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Utwórz klasę" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Klasa" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Nazwa klasy:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Plik nagłówkowy:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Plik źródłowy" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Dziedziczenie" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Klasa podstawowa:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Nagłówek podstawowy" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Globalne" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "GType podstawowy" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Opcje" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Utwórz konstruktor" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Utwórz destruktor" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Typ konstruktora GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Utwó_rz klasę" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 #, fuzzy msgid "_C++ Class" msgstr "Klasa C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 #, fuzzy msgid "_GTK+ Class" msgstr "Klasa GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Znaki HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Wstawia znaki HTML." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 +#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/splitwindow.c:37 #, fuzzy msgid "The Geany developer team" msgstr "Nazwisko programisty" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "znaki HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Znaki ISO-8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Znaki greckie" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Znaki matematyczne" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Znaki techniczne" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Znaki strzałek" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Znaki interpunkcyjne" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Różne znaki" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Znaki specjalne" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "Ws_taw" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4923,64 +5000,64 @@ "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:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Znak" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (nazwa)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Znaki specjalne _HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "Zastąp" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Położenie nowych zakładek plików:" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Wstaw specjalne znaki HTML" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "Znaki specjalne" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 #, fuzzy msgid "Toggle plugin status" msgstr "Przełącz komentowanie linii" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Eksportuj" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Eksportuje bieżący plik do innego formatu." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Eksportuj plik" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "Użyj bieżącego powięks_zenia" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 #, fuzzy msgid "" "Renders the font size of the document together with the current zoom level" @@ -4988,105 +5065,105 @@ "Wyświetla rozmiar czcionki bieżącego dokumentu razem z bieżącym poziomem " "powiększenia." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokument został pomyślnie wyeksportowany do '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Plik '%s' nie mógł zostać zapisany (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Eksportuj" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 #, fuzzy msgid "As _HTML" msgstr "Do HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 #, fuzzy msgid "As _LaTeX" msgstr "Do LateX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 #, fuzzy msgid "File Browser" msgstr "Przeglądarka:" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "" -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 #, fuzzy msgid "_Find in Files" msgstr "Znajdź w _plikach" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 #, fuzzy msgid "Show _Hidden Files" msgstr "Wyświetlanie _ukrytych plików" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 #, fuzzy msgid "Set path from document" msgstr "Przejdź do lewego dokumentu" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 #, fuzzy msgid "Clear the filter" msgstr "Zamyka bieżący plik" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 #, fuzzy msgid "Filter:" msgstr "_Plik" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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)." @@ -5124,7 +5201,7 @@ #: ../plugins/filebrowser.c:1128 #, fuzzy -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "Utworzyć katalog podstawowy dla projektu?" #: ../plugins/filebrowser.c:1132 @@ -5133,32 +5210,32 @@ "Change the directory to the base directory of the currently opened project" msgstr "Zapisuje bieżący plik" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 #, fuzzy msgid "Save Actions" msgstr "Sekcje" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, fuzzy, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Nie można utworzyć katalogu konfiguracyjnego (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, fuzzy, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Plik '%s' nie mógł zostać zapisany (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, fuzzy, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Proces nie może zostać zatrzymany(%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5166,110 +5243,130 @@ msgstr[1] "" #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 #, fuzzy msgid "Select Directory" msgstr "Zaznacz bieżące słowo" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "" -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 #, fuzzy msgid "Auto Save" msgstr "Zapisz" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 #, fuzzy msgid "seconds" msgstr "%s poleceń" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 #, fuzzy msgid "Save only current open _file" msgstr "Zapisuje bieżący plik" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 #, fuzzy msgid "Sa_ve all open files" msgstr "Zapisuje wszystkie otwarte pliki" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 #, fuzzy msgid "Instant Save" msgstr "Wstaw datę" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 #, fuzzy msgid "_Filetype to use for newly opened files:" msgstr "Ustaw domyślne kodowanie dla nowych plików." -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, 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 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "" +#~ msgid "Diff file" +#~ msgstr "Plik Diff" + +#~ msgid "reStructuredText file" +#~ msgstr "Plik reStructuredText" + +#~ msgid "Select _All" +#~ msgstr "Z_aznacz wszystko" + +#, fuzzy +#~ msgid "Automatic symbol completion" +#~ msgstr "Automatyczne uzupełnianie wyrażeń" + #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Nie udało się wyświetlić %s (upewnij się, że wykonano kompilację)" @@ -5669,9 +5766,6 @@ #~ "Gdy zostanie wybrany punkt zwinięcia, rozwija wszystkie potomne punkty " #~ "zwinięcia" -#~ msgid "Construct autocompletion" -#~ msgstr "_Automatyczne uzupełnianie pętli" - #~ msgid "Automatic completion of often used constructs like if and for" #~ msgstr "" #~ "Umożliwia automatyczne uzupełnianie pętli takich jak np. \"if\" i \"for\"" @@ -5693,10 +5787,6 @@ #~ msgid "Complete construct" #~ msgstr "Utwórz konstruktor" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Automatyczne uzupełnianie konstrukcji" - #~ msgid "Go to tag definition" #~ msgstr "Przejdź do definicji znacznika" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/pt_BR.po /tmp/ssBwSf4GIv/geany-0.18/po/pt_BR.po --- geany-0.17/po/pt_BR.po 2009-04-27 20:34:03.000000000 +0100 +++ geany-0.18/po/pt_BR.po 2009-08-16 17:18:28.000000000 +0100 @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.1\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" -"PO-Revision-Date: 2009-04-26 19:37-0300\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"PO-Revision-Date: 2009-08-03 10:46-0300\n" "Last-Translator: Adrovane Marques Kade \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -21,9 +21,7 @@ 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:262 ../src/interface.c:1476 msgid "Geany" msgstr "Geany" @@ -31,211 +29,210 @@ msgid "Integrated Development Environment" msgstr "Ambiente de Desenvolvimento Integrado" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Sobre o Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Um IDE rápido e leve" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Informações" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Desenvolvedores" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "Mantenedor" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "desenvolvedor" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "mantenedor de traduções" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Tradutores" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Tradutores anteriores" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Colaboradores" -#: ../src/about.c:340 +#: ../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 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Créditos" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licença" -#: ../src/about.c:389 -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: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/build.c:219 -#: ../src/build.c:769 +#: ../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 "Não foi possível encontrar terminal '%s' (verifique o caminho para o Terminal nas Preferências)" +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:234 -#: ../src/build.c:674 +#: ../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 (script de inicialização não pôde ser criado)" -#: ../src/build.c:270 -#: ../src/build.c:552 -#: ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Processo falhou (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (no diretório: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Falha ao alterar o diretório atual para %s" -#: ../src/build.c:731 -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: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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Compilação falhou." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Compilação terminada com sucesso." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Compilar" #. build the code -#: ../src/build.c:1060 -#: ../src/build.c:2130 -#: ../src/interface.c:976 +#: ../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:1072 -#: ../src/build.c:1178 -#: ../src/build.c:2141 +#: ../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:1081 -#: ../src/build.c:1187 -#: ../src/build.c:2149 +#: ../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:1090 -#: ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make O_bjeto" #. next error -#: ../src/build.c:1103 -#: ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Próximo Erro" -#: ../src/build.c:1110 -#: ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Erro _Anterior" #. arguments -#: ../src/build.c:1135 -#: ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "Definir _Includes e Argumentos" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_Visualizar Arquivo DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "V_isualizar Arquivo PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Definir Argumentos" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Definir Argumentos" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Criação de DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Criação de PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Visualização de DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Visualização de PDF:" -#: ../src/build.c:1414 -#: ../src/build.c:1596 +#: ../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" @@ -244,69 +241,70 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Definir Includes e Argumentos" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Define os comandos para construir e executar programas." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr " %s comandos" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Compilar:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Construir:" -#: ../src/build.c:1573 -#: ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Executar:" -#: ../src/build.c:1901 -#: ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Constrói o arquivo atual" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make com Destino Personalizado" -#: ../src/build.c:1927 -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: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:1976 +#: ../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:1979 +#: ../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" +msgstr "" +"Constrói o arquivo atual com a ferramenta make e o destino especificado" -#: ../src/build.c:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Compila o arquivo atual com o Make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Falha ao executar o visualizador" -#: ../src/build.c:2082 +#: ../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:2101 -#: ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Não há mais erros de construção." @@ -314,10 +312,8 @@ msgid "Do you really want to quit?" msgstr "Deseja realmente sair?" -#: ../src/callbacks.c:469 -#: ../src/document.c:2898 -#: ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "Recarre_gar" @@ -330,348 +326,396 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Tem certeza de que deseja recarregar '%s'?" -#: ../src/callbacks.c:1246 -#: ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Ir para Linha" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Insira a linha para a qual você quer ir:" -#: ../src/callbacks.c:1341 -#: ../src/callbacks.c:1366 -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: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:1471 -#: ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.aaaa" -#: ../src/callbacks.c:1473 -#: ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.aaaa" -#: ../src/callbacks.c:1475 -#: ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "aaaa/mm/dd" -#: ../src/callbacks.c:1477 -#: ../src/ui_utils.c:559 +#: ../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:1479 -#: ../src/ui_utils.c:560 +#: ../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:1481 -#: ../src/ui_utils.c:561 +#: ../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:1483 -#: ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Usar Formato de Data Personalizado" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Formato de Data Personalizado" -#: ../src/callbacks.c:1495 -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: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:1513 +#: ../src/callbacks.c:1516 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:1770 -#: ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Não há mais itens de mensagens." #. initialize the dialog -#: ../src/dialogs.c:143 -#: ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Abrir Arquivo" -#: ../src/dialogs.c:147 -#: ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "E_xibir" -#: ../src/dialogs.c:150 -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: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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Detectar a partir da extensão do arquivo" -#: ../src/dialogs.c:197 -#: ../src/interface.c:3538 -#: ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Detectar a partir do arquivo" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "_Mais Opções" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Mostrar arquivos _ocultos" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Definir codificação:" -#: ../src/dialogs.c:287 +#: ../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." +"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:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Definir tipo de arquivo:" -#: ../src/dialogs.c:304 +#: ../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." +"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?" +msgstr "Sobrescrever?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Nome de arquivo já existe!" -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Salvar Arquivo" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "R_enomear" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Salva o arquivo e o renomeia" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Abrir arquivo em uma nova aba" -#: ../src/dialogs.c:431 -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: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:567 ../src/win32.c:562 +msgid "Error" +msgstr "Erro" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Pergunta" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Aviso" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informação" -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Não salvar" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "O arquivo '%s' não está salvo." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Você deseja salvá-lo antes de fechar?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Escolher fonte" -#: ../src/dialogs.c:971 -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:990 -#: ../src/dialogs.c:991 -#: ../src/dialogs.c:992 -#: ../src/dialogs.c:998 -#: ../src/dialogs.c:999 -#: ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 -#: ../src/symbols.c:1685 -#: ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 msgid "unknown" msgstr "desconhecido" -#: ../src/dialogs.c:1005 -#: ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Propriedades" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Tipo:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Tamanho:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Localização:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Somente-leitura:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(apenas dentro do Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Codificação:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 -#: ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(com BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(sem BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Modificado:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Alterado:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Acessado:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Permissões:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Leitura:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Escrita:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Dono:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Grupo:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Outros:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Arquivo %s fechado." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Novo arquivo \"%s\" aberto." -#: ../src/document.c:964 -#: ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Não foi possível abrir o arquivo %s (%s)" -#: ../src/document.c:994 +#: ../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 \"%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:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "O arquivo \"%s\" não é válido %s." -#: ../src/document.c:1030 +#: ../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 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:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Espaços" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabs" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Definindo %s modo de endentação para %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Nome de arquivo inválido" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Arquivo %s recarregado." -#: ../src/document.c:1354 +#. 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 "Arquivo %s aberto (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", somente-leitura" -#: ../src/document.c:1561 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Erro ao renomear arquivo." -#: ../src/document.c:1636 +#: ../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 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:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -680,58 +724,52 @@ "Mensagem de erro: %s\n" "O erro ocorreu em \"%s\" (linha: %d, coluna %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Mensagem de erro: %s." -#: ../src/document.c:1763 -#: ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Erro ao salvar arquivo." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Erro ao salvar arquivo (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Arquivo %s salvo." -#: ../src/document.c:1913 -#: ../src/document.c:1970 -#: ../src/document.c:1978 +#: ../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:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Circular pesquisa e procurar novamente?" -#: ../src/document.c:2057 -#: ../src/search.c:1065 -#: ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Nenhuma combinação encontrada para '%s'." -#: ../src/document.c:2068 -#: ../src/document.c:2077 +#: ../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: %d ocorrência de \"%s\" substituída por \"%s\"." msgstr[1] "%s: %d ocorrências de \"%s\" substituídas por \"%s\"." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Deseja recarregá-lo?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -740,44 +778,30 @@ "O arquivo '%s' que está no disco é \n" "mais recente do que o buffer atual." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Tentar salvar novamente o arquivo?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Arquivo \"%s\" não foi encontrado no disco!" -#: ../src/editor.c:3852 -#: ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 -#: ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 -#: ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Insira a Largura do Tab:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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/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" @@ -789,31 +813,22 @@ 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" @@ -829,16 +844,12 @@ 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" @@ -858,201 +869,147 @@ 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:141 -#: ../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" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Sem codificação" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "Europeu _Ocidental" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "Europeu O_riental" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Asiático Or_iental" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "Asiático _SE e SO" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "Oriente _Médio" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 -#: ../src/filetypes.c:91 -#: ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Nenhum" - -#: ../src/filetypes.c:102 -#: ../src/filetypes.c:113 -#: ../src/filetypes.c:125 -#: ../src/filetypes.c:136 -#: ../src/filetypes.c:147 -#: ../src/filetypes.c:158 -#: ../src/filetypes.c:169 -#: ../src/filetypes.c:181 -#: ../src/filetypes.c:192 -#: ../src/filetypes.c:203 -#: ../src/filetypes.c:214 -#: ../src/filetypes.c:225 -#: ../src/filetypes.c:236 -#: ../src/filetypes.c:247 -#: ../src/filetypes.c:259 -#: ../src/filetypes.c:271 -#: ../src/filetypes.c:282 -#: ../src/filetypes.c:293 -#: ../src/filetypes.c:304 -#: ../src/filetypes.c:315 -#: ../src/filetypes.c:326 -#: ../src/filetypes.c:337 -#: ../src/filetypes.c:384 -#: ../src/filetypes.c:395 -#: ../src/filetypes.c:429 -#: ../src/filetypes.c:440 -#: ../src/filetypes.c:485 -#: ../src/filetypes.c:496 -#: ../src/filetypes.c:530 -#: ../src/filetypes.c:541 -#: ../src/filetypes.c:552 -#: ../src/filetypes.c:563 -#: ../src/filetypes.c:574 +#: ../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 "Arquivo-fonte %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "Arquivo %s" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Nenhum" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Arquivo script Shell" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Arquivo Make" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Documento XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "Arquivo dump SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Arquivo diff" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Arquivo config" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Arquivo de tradução gettext" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "Arquivo script %s" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Arquivo reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Linguagens de _Programação" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Linguagens de _Script" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Linguagens de _Marcação" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "L_inguagens Diversas" -#: ../src/filetypes.c:1284 -#: ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Todos os fontes" -#: ../src/filetypes.c:1309 -#: ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Todos os arquivos" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Regex ruim para o tipo de arquivo %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "sem título" @@ -1064,16 +1021,10 @@ 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:2006 -#: ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../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" @@ -1081,8 +1032,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 -#: ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "A_brir Arquivo Selecionado" @@ -1102,13 +1052,11 @@ msgid "Page Set_up" msgstr "Config_urar página" -#: ../src/interface.c:393 -#: ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Fec_har Outros Documentos" -#: ../src/interface.c:401 -#: ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Fechar T_udo" @@ -1116,103 +1064,79 @@ msgid "_Edit" msgstr "_Editar" -#: ../src/interface.c:459 -#: ../src/interface.c:1919 -msgid "Select _All" -msgstr "Selecion_ar Tudo" - -#: ../src/interface.c:468 -#: ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Formatar" -#: ../src/interface.c:475 -#: ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "A_lterar maiúsculas/minúsculas da seleção" -#: ../src/interface.c:484 -#: ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Comentar Linha(s)" -#: ../src/interface.c:488 -#: ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "_Descomentar Linha(s)" -#: ../src/interface.c:492 -#: ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "A_lternar Comentário de Linha" -#: ../src/interface.c:496 -#: ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Aumen_tar Endentação" -#: ../src/interface.c:513 -#: ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Dimi_nuir Endentação" -#: ../src/interface.c:526 -#: ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "_Enviar Seleção para o Terminal" -#: ../src/interface.c:530 -#: ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Enviar Seleção para" -#: ../src/interface.c:545 -#: ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "I_nserir Comentários" -#: ../src/interface.c:556 -#: ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Inserir Entrada de _ChangeLog" -#: ../src/interface.c:560 -#: ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Inserir Cabeçal_ho de Arquivo" -#: ../src/interface.c:564 -#: ../src/interface.c:2033 +#: ../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:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Inserir Comentário _Multilinha" -#: ../src/interface.c:572 -#: ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Inserir Advertência da _GPL" -#: ../src/interface.c:576 -#: ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Inserir Advertência de Licença _BSD" -#: ../src/interface.c:580 -#: ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Ins_erir Data" -#: ../src/interface.c:594 -#: ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "_Inserir \"include <...>\"" @@ -1236,8 +1160,7 @@ msgid "Find in F_iles" msgstr "Localizar em Ar_quivos" -#: ../src/interface.c:644 -#: ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Substitui_r" @@ -1257,8 +1180,7 @@ msgid "Pr_evious Message" msgstr "M_ensagem Prévia" -#: ../src/interface.c:683 -#: ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "_Ir para Linha" @@ -1286,9 +1208,7 @@ msgid "Show Side_bar" msgstr "Exibir Barra _Lateral" -#: ../src/interface.c:734 -#: ../src/interface.c:3865 -#: ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1332,21 +1252,15 @@ msgid "In_dent Type" msgstr "T_ipo de endentação" -#: ../src/interface.c:808 -#: ../src/interface.c:3496 -#: ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tabs" -#: ../src/interface.c:814 -#: ../src/interface.c:3487 -#: ../src/interface.c:5035 +#: ../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:3505 -#: ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_abs e Espaços" @@ -1450,8 +1364,7 @@ msgid "_Reload Configuration" msgstr "_Recarregar configuração" -#: ../src/interface.c:1011 -#: ../src/interface.c:1018 +#: ../src/interface.c:1011 ../src/interface.c:1018 msgid "_Help" msgstr "_Ajuda" @@ -1467,8 +1380,7 @@ msgid "_Debug Messages" msgstr "_Depurar Mensagens" -#: ../src/interface.c:1073 -#: ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Símbolos" @@ -1492,1619 +1404,1790 @@ msgid "Scribble" msgstr "Rascunho" -#: ../src/interface.c:1725 -#: ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Im_agens e Texto" -#: ../src/interface.c:1731 -#: ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Somente _Imagens" -#: ../src/interface.c:1737 -#: ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Somente _Texto" -#: ../src/interface.c:1748 -#: ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Ícones _Grandes" -#: ../src/interface.c:1754 -#: ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Ícone_s Pequenos" -#: ../src/interface.c:1760 -#: ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "Ícones _Muito Pequenos" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "_Personalizar Barra de Ferramentas" + +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" msgstr "_Ocultar Barra de Ferramentas" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Localizar _Uso" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Localizar Uso do _Documento" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Ir para a Definição do Ró_tulo" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Ir p_ara a Declaração do Rótulo" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Ação Conte_xtual" -#: ../src/interface.c:2647 -#: ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Preferências" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Abrir arquivos da última sessão" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Abre os arquivos da última sessão ao iniciar" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Carregar suporte ao terminal virtual" -#: ../src/interface.c:2690 -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: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:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Habilitar suporte a plugin" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Iniciar" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Salvar a posição e geometria da janela" -#: ../src/interface.c:2718 +#: ../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 a restaura ao iniciar" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Confirmar saída" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Exibe um diálogo de confirmação ao sair" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Desligar" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Caminho inicial:" -#: ../src/interface.c:2758 -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: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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Arquivos de Projeto:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Caminho para iniciar quando estiver abrindo arquivos de projeto" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Caminho extra de plugins:" -#: ../src/interface.c:2808 -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: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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Caminhos" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Iniciar" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 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:2851 -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: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:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Ir para lista de mensagens de estado quando houver nova mensagem" -#: ../src/interface.c:2856 -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: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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Suprimir mensagens de estado na barra de estado" -#: ../src/interface.c:2861 -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:2863 -msgid "Auto focus widgets (focus follows mouse)" -msgstr "Foco automático de painéis (o foco acompanha o mouse)" - -#: ../src/interface.c:2866 -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: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:2868 -#: ../src/interface.c:3194 -#: ../src/interface.c:4074 +#: ../src/interface.c:2883 +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 msgid "Miscellaneous" msgstr "Miscelânea" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Sempre circular a pesquisa e ocultar o diálogo Localizar" -#: ../src/interface.c:2891 -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: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:2893 +#: ../src/interface.c:2913 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:2896 -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: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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Pesquisar" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Usar arquivos de sessão baseados em projeto" -#: ../src/interface.c:2924 -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: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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Armazenar arquivo de projeto dentro do diretório base do projeto" -#: ../src/interface.c:2929 -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: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:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projetos" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Miscelânea" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Geral" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Exibir lista de símbolos" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Exibe ou esconde a lista de símbolos" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Exibir lista de documentos" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Exibe ou esconde a lista de documentos" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Barra Lateral" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Lista de Símbolos:" -#: ../src/interface.c:3001 -#: ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Janela de Mensagens:" -#: ../src/interface.c:3008 -#: ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Define a fonte para a janela de mensagens" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Define a fonte para a lista de símbolos" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Define a fonte do editor" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Fontes" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Exibir abas do editor" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Exibir botões de fechar" -#: ../src/interface.c:3064 -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: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:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Localização das abas de novo arquivo:" -#: ../src/interface.c:3075 -#: ../src/interface.c:3129 -#: ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Esquerda" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 -#: ../src/interface.c:3130 -#: ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Direita" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Duplo clique oculta todos os painéis adicionais" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Chama o comando Exibir->Alternar Todos os Painéis Adicionais" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Abas do editor" -#: ../src/interface.c:3131 -#: ../src/interface.c:3149 -#: ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Cima" -#: ../src/interface.c:3132 -#: ../src/interface.c:3150 -#: ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Baixo" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Barra Lateral:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Posições das abas" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Exibir barra de estado" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interface" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Exibir Barra de Ferramen_tas" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "_Anexar Barra de Ferramentas ao Menu" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 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" +msgstr "" +"Empacota a barra de ferramentas no menu principal, para economizar espaço " +"vertical" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Barra de ferramentas" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Estilo dos ícones:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Tamanho dos ícones:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Aparência" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "Personalizar Barra de Ferramentas" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Barra de Ferramentas" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Quebrar linhas" -#: ../src/interface.c:3349 -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: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:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Habilitar tecla home \"inteligente\"" -#: ../src/interface.c:3354 -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: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:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Desabilitar Arrastar e Soltar" -#: ../src/interface.c:3359 -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: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:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Habilitar dobra" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Habilitar ou desabilitar dobras de código" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Dobrar/Desdobrar todos os filhos de um ponto de dobra" -#: ../src/interface.c:3369 -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: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:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Usar indicadores para mostrar erros de compilação" -#: ../src/interface.c:3374 -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: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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Nova linha remove espaços no final" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Coluna de quebra de linha:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Comentar marcador de alternar:" -#: ../src/interface.c:3406 -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: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:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Características" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Características" -#: ../src/interface.c:3445 -#: ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Modo de auto endentação:" -#: ../src/interface.c:3458 -#: ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Básico" -#: ../src/interface.c:3459 -#: ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Caracteres atuais" -#: ../src/interface.c:3460 -#: ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Casar delimitadores" -#: ../src/interface.c:3462 -#: ../src/interface.c:3805 -#: ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Tipo:" -#: ../src/interface.c:3469 -#: ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Largura:" -#: ../src/interface.c:3482 -#: ../src/interface.c:5030 +#: ../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 endentação" -#: ../src/interface.c:3492 -#: ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Usar espaços quando inserir endentação" -#: ../src/interface.c:3501 -#: ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Usa um tab por endentação" -#: ../src/interface.c:3510 -#: ../src/interface.c:5058 -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: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:3525 -#: ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Largura do Hard Tab:" -#: ../src/interface.c:3533 -#: ../src/interface.c:5081 +#: ../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" +msgstr "" +"A largura de uma tabulação quando Tabs & Espaços estiver definida para um " +"documento" -#: ../src/interface.c:3543 -#: ../src/interface.c:5091 -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: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:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Endentações da tecla Tab" -#: ../src/interface.c:3548 -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: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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Endentação" -#: ../src/interface.c:3555 -#: ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Endentação" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Completação de fragmento" -#: ../src/interface.c:3581 -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: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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" msgstr "Auto-completação de tags XML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Continuação automática de comentários multi-linha" -#: ../src/interface.c:3591 -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: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:3593 -msgid "Automatic symbol completion" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" msgstr "Auto-completar símbolos" -#: ../src/interface.c:3596 -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: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:3642 +msgid "Autocomplete all words in document" +msgstr "Completa automaticamente todas as palavras no documeto" + +#: ../src/interface.c:3646 +msgid "Drop rest of word on completion" +msgstr "Perder resto da palavra ao completar" -#: ../src/interface.c:3604 +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "Máx. sugestões de nomes de símbolos:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Altura da lista de completação:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" msgstr "Caracteres a digitar para completação:" -#: ../src/interface.c:3631 -msgid "The amount of characters which are necessary to show the symbol auto completion list" -msgstr "A quantidade de caracteres que são necessários para mostrar a lista de auto-completação de símbolos" - -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" -msgstr "Exibir altura em linhas para a lista de auto-completar" +#: ../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:3649 -msgid "Maximum number of entries to display in the auto completion list" -msgstr "Número máximo de entradas para exibir na lista de auto-completar" +#: ../src/interface.c:3692 +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 +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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Completações" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Parênteses ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Fechar parênteses automaticamente quando um for aberto" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Aspas simples ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "Fechar aspas simples automaticamente quando um for aberto" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Chaves { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Fechar chaves automaticamente quando uma for aberta" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Colchetes [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "Fechar colchetes automaticamente ao digitar um colchete de abertura" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Aspas duplas \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "Fechar aspas duplas automaticamente quando uma for aberta" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Fechar automaticamente aspas e delimitadores" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Completações" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Inverter as cores da destacação sintática" -#: ../src/interface.c:3738 -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: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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Exibir guias de indentação" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Exibir espaços em branco" -#: ../src/interface.c:3748 +#: ../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:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Exibir final de linha" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Exibe o caracter de fim de linha" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Exibir números de linha" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Exibe ou esconde a margem de Números de Linhas" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Exibir margem de marcadores" -#: ../src/interface.c:3763 -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: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:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Parar a rolagem na última linha" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Exibição" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Marcador de linha longa:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Cor do marcador de linha longa:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Define a cor do marcador de linha longa" -#: ../src/interface.c:3818 -#: ../src/toolbar.c:66 -#: ../src/tools.c:746 -#: ../src/vte.c:769 -#: ../src/vte.c:776 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 +#: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Seletor de Cores" -#: ../src/interface.c:3826 -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: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:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Linha" -#: ../src/interface.c:3839 -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: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:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Fundo" -#: ../src/interface.c:3846 -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: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:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Desabilitado" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Marcador de linha longa" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Exibição" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Abrir novos documentos a partir da linha de comando" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Caracteres padrão de fim de linha:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Novo arquivo" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Codificação padrão (arquivos novos):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Codificação padrão (arquivos existentes):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Usar codificação fixa quando abrir arquivos" -#: ../src/interface.c:3978 -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: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:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Codificações" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Garantir nova linha no final do arquivo" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Remover espaços e tabs no final" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 -#: ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Substituir tabs por espaços" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Substitui todas as tabulações no documento por espaços" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Salvando arquivos" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Tamanho da lista de arquivos recentes:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Timeout de verificação de disco:" -#: ../src/interface.c:4070 -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:4079 -#: ../src/symbols.c:574 -#: ../plugins/filebrowser.c:1016 +#: ../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 msgid "Files" msgstr "Arquivos" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Navegador:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Caminho e opções para a ferramenta make" -#: ../src/interface.c:4145 -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: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:4152 +#: ../src/interface.c:4204 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:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Caminhos de ferramentas" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Ação Contextual:" -#: ../src/interface.c:4239 +#: ../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 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:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Comandos" -#: ../src/interface.c:4257 -#: ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Ferramentas" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "Endereço de e-mail do desenvolvedor" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Iniciais do nome do desenvolvedor" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Versão Inicial:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Número de versão que um novo arquivo possui inicialmente" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Nome da empresa" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Desenvolvedor:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Empresa:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Endereço:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Iniciais:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "O nome do desenvolvedor" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Ano:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Data & Hora:" -#: ../src/interface.c:4382 -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:4389 -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:4396 -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: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: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: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:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Dados de templates" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Templates" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "_Alterar" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Atalhos de teclado" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Ligações de teclas" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Comando:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Usar um comando externo para imprimir" -#: ../src/interface.c:4510 -#: ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Imprimir números de linhas" -#: ../src/interface.c:4513 -#: ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Inclui números de linha à página impressa" -#: ../src/interface.c:4515 -#: ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Imprimir o número da página" -#: ../src/interface.c:4518 -#: ../src/printing.c:352 -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: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:4520 -#: ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Imprimir o cabeçalho da página" -#: ../src/interface.c:4523 -#: ../src/printing.c:357 -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: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:4540 -#: ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Usar o nome básico do arquivo impresso" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 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:4549 -#: ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Formato de Data:" -#: ../src/interface.c:4556 -#: ../src/printing.c:387 -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: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:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Usar impressão nativa do GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Impressão" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Propriedades do Projeto" -#: ../src/keybindings.c:196 -#: ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Arquivo" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nova" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Abrir" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Abrir arquivo selecionado" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Salvar" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Salvar como" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Salvar tudo" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Imprimir" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Fechar" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Fechar tudo" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Recarregar arquivo" -#: ../src/keybindings.c:222 -#: ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Projeto" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Propriedades do projeto" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Desfazer" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Refazer" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Duplicar linha ou seleção" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Apagar linha(s) atual(is)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Rolar para a linha atual" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Rolar a visualização uma linha para cima" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Rolar a visualização uma linha para baixo" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Completar fragmento" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Mover cursor no fragmento" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Suprimir completação de fragmento" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Ação Contextual" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Completar palavra" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Exibir dica" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Exibir lista de macros" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Área de Transferência" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Copiar" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Copiar" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Colar" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Copiar linha(s) atual(is)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Recortar linha(s) atual(is)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Selecionar" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Selecionar Tudo" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Selecionar palavra atual" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Selecionar linha(s) atual(is)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Selecionar parágrafo atual" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Formatar" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Alterar maiúsculas/minúsculas da seleção" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Alternar comentário de linhas" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Comentar linha(s)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Descomentar linha(s)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Aumentar indentação" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Diminuir indentação" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Aumentar endentação em um espaço" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Diminuir endentação em um espaço" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Endentação de linha inteligente" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Enviar para Comando Personalizado 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Enviar para Comando Personalizado 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Enviar para Comando Personalizado 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Enviar Seleção para o Terminal" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "Refluir linhas/bloco" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Inserir" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Inserir data" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Inserir espaço em branco alternativo" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Definições" -#: ../src/keybindings.c:333 -#: ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Pesquisar" -#: ../src/keybindings.c:336 -#: ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Localizar" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Localizar Próxima" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Localizar Anterior" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Localizar Próxima Seleção" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Localizar Seleção Anterior" -#: ../src/keybindings.c:347 -#: ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Substituir" -#: ../src/keybindings.c:349 -#: ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Pesquisar em Arquivos" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Próxima Mensagem" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Mensagem Prévia" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Encontrar Uso" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Encontrar Uso do Documento" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "Marcar Tudo" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Ir Para" -#: ../src/keybindings.c:363 -#: ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Navega para um local anterior" -#: ../src/keybindings.c:365 -#: ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Navega para um local adiante" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Ir para delimitador combinante" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Alternar marcador" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Ir para o próximo marcador" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Ir para o marcador anterior" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Ir para a Definição do Rótulo" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Ir para a Declaração do Rótulo" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Ir para o Início da Linha" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Ir para o Fim da Linha" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "Ir para o Fim de Exibir Linha" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Ir para a Parte Prévia da Palavra" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Ir para a Próxima Parte da Palavra" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Exibir" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Exibir/esconder todos os painéis adicionais" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Tela Cheia" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Alternar Janela de Mensagens" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Alternar Barra Lateral" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Aumentar Zoom" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Diminuir Zoom" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Foco" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Ir para o Editor" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Ir para o Rascunho" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Ir para o VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Ir para a Barra de Pesquisa" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Alternar para Barra Lateral" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Alternar para Compilador" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Aba do Bloco de Notas" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Ir para o documento à esquerda" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Ir para o documento à direita" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Ir para o último documento usado" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Mover documento para a esquerda" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Mover documento para a direita" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Move documento para o início" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Mover documento para o fim" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Documento" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Alternar Line Wrapping" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Alternar Quebra de Linha" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Substituir espaços por tabs" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Alternar dobra atual" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Dobrar tudo" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Desdobrar tudo" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Recarregar lista de símbolos" -#: ../src/keybindings.c:461 -#: ../src/keybindings.c:466 -#: ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Construir" -#: ../src/keybindings.c:464 -#: ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Compilar" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Make com destino personalizado" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make objeto" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Próximo erro" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Erro Prévio" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Executar" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Executar (comando alternativo)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Opções de construção" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Exibir Seletor de Cores" -#: ../src/keybindings.c:490 -#: ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Ajuda" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Atalhos de Teclado" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Os atalhos de teclado a seguir são configuráveis:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Ir para o Documento " -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Falha ao carregar um ou mais arquivos de sessão." -#: ../src/log.c:177 +#: ../src/log.c:181 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)" +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 msgid "Use an alternate configuration directory" msgstr "Usar um diretório de configuração alternativo" -#: ../src/main.c:126 -#: ../src/main.c:146 +#: ../src/main.c:126 ../src/main.c:146 msgid "Be verbose" msgstr "Ser verboso" @@ -3122,7 +3205,9 @@ #: ../src/main.c:132 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 msgid "Set initial line number for the first opened file" @@ -3145,8 +3230,8 @@ msgstr "Imprimir o prefixo de instalação do Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "não carregar os arquivos da sessão anterior" +msgid "Don't load the previous session's files" +msgstr "Não carregar os arquivos da sessão anterior" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3160,36 +3245,46 @@ msgid "Show version and exit" msgstr "Exibir versão e sair" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[ARQUIVOS...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Mover agora?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, 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:649 +#: ../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 "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:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3200,23 +3295,22 @@ "Podem ocorrer problemas no uso do Geany sem um diretório de configuração.\n" "Iniciar o Geany mesmo assim?" -#: ../src/main.c:816 -#: ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Esse é o Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, 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:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Arquivos de configuração recarregados." @@ -3232,16 +3326,20 @@ msgid "_Hide Message Window" msgstr "_Esconder Janela de Mensagens" -#: ../src/plugins.c:442 +#: ../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 é um binário compatível com esta versão do Geany. Por favor, recompile-o." +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:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Gerenciador de _Plugins" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3252,134 +3350,177 @@ "Descrição: %s\n" "Autor(es): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Ativo" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Nenhum plugin disponível." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1263 -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: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:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Detalhes do plugin:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Ação" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Atalho" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Capturar tecla" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "_Expandir Tudo" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "_Colapsar Tudo" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Ação" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Atalho" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Sobrepor" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Sobrepor esta ligação de tecla?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "A combinação '%s' já está sendo usada para \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 -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:1458 -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: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." #. page Keybindings -#: ../src/prefs.c:1464 -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: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." #. page Printing -#: ../src/prefs.c:1469 -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 Toolbar -#: ../src/prefs.c:1475 -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 arquivo 'ui_toolbar.xml'. Por favor, veja a documentação para detalhes." +#: ../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)." #. page Editor->Indentation -#: ../src/prefs.c:1481 -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: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/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "A fonte do editor não é uma fonte mono-espaçada!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "O texto não será espaçado corretamente." -#: ../src/printing.c:270 +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Configurar Documento" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Impressão do arquivo %s foi cancelada." -#: ../src/printing.c:743 -#: ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Arquivo %s impresso." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "A impressão de %s falhou (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 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:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3390,7 +3531,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Impressão de \"%s\" falhou (código de retorno: %s)." @@ -3409,611 +3550,569 @@ msgid "C_reate" msgstr "_Criar" -#: ../src/project.c:140 -#: ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nome:" -#: ../src/project.c:149 -#: ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Nome do Arquivo:" -#: ../src/project.c:165 -#: ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Caminho base:" -#: ../src/project.c:171 -#: ../src/project.c:434 -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: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:174 -#: ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Escolher Caminho Base do Projeto" -#: ../src/project.c:235 -#: ../src/project.c:266 -#: ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Arquivo de projeto \"%s\" não pôde ser carregado." -#: ../src/project.c:260 -#: ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Abrir Projeto" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Arquivos do projeto" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Projeto \"%s\" fechado." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Descrição:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Executar make no caminho base" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Comando para executar:" -#: ../src/project.c:457 -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: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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Padrões de arquivo:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Você deseja fechar antes de prosseguir?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "O projeto '%s' já está aberto." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "O nome especificado para o projeto é muito curto." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Você especificou um nome de arquivo inválido para o projeto." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Criar o diretório de caminho base para o projeto?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "O caminho \"%s\" não existe." -#: ../src/project.c:666 +#: ../src/project.c:670 #, 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:678 +#: ../src/project.c:682 #, 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:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Projeto \"%s\" criado." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Projeto \"%s\" salvo." #. initialise the dialog -#: ../src/project.c:794 -#: ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Escolher Nome de Arquivo do Projeto" #. initialise the dialog -#: ../src/project.c:823 -#: ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Escolher Comando para Executar o Projeto" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Projeto \"%s\" aberto." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "_Usar expressões regulares" -#: ../src/search.c:205 -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: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:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "_Pesquisar para trás" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Usar seqüências de _escape" -#: ../src/search.c:231 +#: ../src/search.c:246 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:240 -#: ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "_Sensível ao caso" -#: ../src/search.c:245 -#: ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Combinar somente uma _palavra inteira" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Combinar a partir do _início da palavra" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Anterior" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Próximo" -#: ../src/search.c:381 -#: ../src/search.c:520 -#: ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "P_esquisar por:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Encontrar Todas" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Marcar" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Marcar todas as combinações no documento atual" -#: ../src/search.c:423 -#: ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "Na _Sessão" -#: ../src/search.c:428 -#: ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "No _Documento" #. close window checkbox -#: ../src/search.c:434 -#: ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "_Fechar diálogo" -#: ../src/search.c:439 -#: ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Desabilite essa opção para manter o diálogo aberto" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "_Substituir & Encontrar" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "S_ubstituir com:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "_Substituir Todos" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "Na Se_leção" -#: ../src/search.c:592 +#: ../src/search.c:607 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:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Diretório:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "_Codificação:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Strings _Fixas" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Grep expressões regulares" -#: ../src/search.c:749 -#: ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 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:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "E_xpressões regulares estendidas" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "_Recursivo nas sub-pastas" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Inverter resultados da pesquisa" -#: ../src/search.c:782 +#: ../src/search.c:797 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:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Opções E_xtra:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Outras opções para passar para o Grep" -#: ../src/search.c:1068 -#: ../src/search.c:1675 -#: ../src/search.c:1678 +#: ../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] "%d combinação encontrada para '%s'." msgstr[1] "%d combinações encontradas para '%s'." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Diretório de pesquisa de arquivos inválido." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Nenhum texto para procurar." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Pesquisando..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (no diretório: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Não foi possível abrir diretório (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Nenhuma combinação encontrada." -#: ../src/symbols.c:580 -#: ../src/symbols.c:621 -#: ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Capítulo" -#: ../src/symbols.c:581 -#: ../src/symbols.c:617 -#: ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Seção" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sec1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sec2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sec3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Apêndice" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 -#: ../src/symbols.c:622 -#: ../src/symbols.c:743 -#: ../src/symbols.c:757 -#: ../src/symbols.c:769 -#: ../src/symbols.c:781 -#: ../src/symbols.c:796 -#: ../src/symbols.c:841 +#: ../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 "Outro" -#: ../src/symbols.c:593 -#: ../src/symbols.c:789 -#: ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Módulo" -#: ../src/symbols.c:594 -#: ../src/symbols.c:767 -#: ../src/symbols.c:779 -#: ../src/symbols.c:794 -#: ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Tipos" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Construtores de tipos" -#: ../src/symbols.c:596 -#: ../src/symbols.c:608 -#: ../src/symbols.c:629 -#: ../src/symbols.c:638 -#: ../src/symbols.c:653 -#: ../src/symbols.c:665 -#: ../src/symbols.c:709 -#: ../src/symbols.c:722 -#: ../src/symbols.c:753 -#: ../src/symbols.c:776 -#: ../src/symbols.c:791 -#: ../src/symbols.c:828 +#: ../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 "Funções" -#: ../src/symbols.c:601 -#: ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Seções" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Chaves" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 -#: ../src/symbols.c:655 -#: ../src/symbols.c:710 -#: ../src/symbols.c:726 -#: ../src/symbols.c:755 -#: ../src/symbols.c:768 -#: ../src/symbols.c:777 -#: ../src/symbols.c:793 -#: ../src/symbols.c:840 +#: ../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 "Variáveis" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Comando" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Ambiente" -#: ../src/symbols.c:618 -#: ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Subseção" -#: ../src/symbols.c:619 -#: ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Subsubseção" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Rótulo" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Estruturas" -#: ../src/symbols.c:637 -#: ../src/symbols.c:736 -#: ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Pacote" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Meu" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Nosso" -#: ../src/symbols.c:651 -#: ../src/symbols.c:737 -#: ../src/symbols.c:751 -#: ../src/symbols.c:764 -#: ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:652 -#: ../src/symbols.c:676 -#: ../src/symbols.c:695 -#: ../src/symbols.c:707 -#: ../src/symbols.c:738 -#: ../src/symbols.c:752 -#: ../src/symbols.c:765 -#: ../src/symbols.c:827 +#: ../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 "Classes" -#: ../src/symbols.c:654 -#: ../src/symbols.c:756 -#: ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Constantes" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Âncoras" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Cabeçalhos H1" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Cabeçalhos H2" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Cabeçalhos H3" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "Seletores ID" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Seletores de Tipo" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Módulos" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:697 -#: ../src/symbols.c:708 -#: ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Métodos" -#: ../src/symbols.c:740 -#: ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Espaços de nomes" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Procedimentos" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "Imports" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Membros" -#: ../src/symbols.c:780 -#: ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Rótulos" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Sub-rotinas" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blocos" -#: ../src/symbols.c:804 -#: ../src/symbols.c:813 -#: ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Macros" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Definições" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Destinos" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Espaços de nomes" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Structs" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Extensão de tipo de arquivo desconhecida para \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4022,184 +4121,205 @@ "Uso: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../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" +"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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Carregar Tags" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Arquivo de tags '%s' carregou %s." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Não foi possível carregar arquivo de tags '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Declaração avançada \"%s()\" não encontrada." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definição de \"%s()\" não encontrada." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "_Expandir Tudo" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "_Colapsar Tudo" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Ordenar por _Nome" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Ordenar por _Aparecimento" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Salva o arquivo atual" -#: ../src/toolbar.c:52 -#: ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Salvar Tudo" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Salva todos os arquivos abertos" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Recarrega do disco o arquivo atual" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Fecha o arquivo atual" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Fecha todos os arquivos abertos" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Recortar a seleção atual" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Copiar a seleção atual" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Colar os conteúdos da área de transferência" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Excluir a seleção atual" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Desfaz a última modificação" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Refaz a última modificação" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Compila o arquivo atual" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Executa ou visualiza o arquivo atual" -#: ../src/toolbar.c:66 -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: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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Aumenta o zoom do texto" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Diminui o zoom do texto" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Diminuir endentação" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Aumentar endentação" -#: ../src/toolbar.c:71 -#: ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Encontra no arquivo atual o texto inserido" -#: ../src/toolbar.c:72 -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Pula para o número de linha informado" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Exibir o diálogo de preferências" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Sair do Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Imprimir documento" -#: ../src/toolbar.c:153 -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." +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "Substituir texto no documento atual" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Cria um novo arquivo" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Abre um arquivo existente" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Ir Para" +#: ../src/toolbar.c:533 +msgid "Separator" +msgstr "Separador" + +#: ../src/toolbar.c:534 +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:913 +msgid "Available Items" +msgstr "Itens disponíveis" + +#: ../src/toolbar.c:934 +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 @@ -4211,17 +4331,19 @@ 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:538 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:506 ../src/tools.c:510 msgid "No custom commands defined." msgstr "Nenhum comando personalizado definido." @@ -4253,126 +4375,144 @@ msgid "Characters:" msgstr "Caracteres:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Nenhuma tag encontrada" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Exibir Lista de _Símbolos" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Exibir Lista de _Documentos" -#: ../src/treeviews.c:506 -#: ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "_Ocultar Barra Lateral" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "Exibir _Caminhos" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "linha: %d\t col: %d\t sel: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "SL" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "SOB" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "ESP " -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "modo: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "codificação: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "tipo de arquivo: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "escopo: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Fonte atualizada (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Biblioteca Padrão C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Biblioteca Padrão C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Biblioteca Padrão C++" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "STL C++" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Definir Formato Personalizado de Data" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Selecionar Pasta" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Selecionar Arquivo" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Arquivos de C_onfiguração" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Salvar Tudo" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Fechar Tudo" -#: ../src/vte.c:301 -#: ../src/vte.c:726 +#: ../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 "Terminal" @@ -4389,16 +4529,24 @@ 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." +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." +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:740 msgid "Terminal font:" @@ -4429,16 +4577,23 @@ 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" +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 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" +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 msgid "Scroll on keystroke" @@ -4469,25 +4624,34 @@ 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)" +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 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." +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:840 ../plugins/filebrowser.c:1122 msgid "Follow the path of the current file" msgstr "Seguir o caminho do arquivo padrão" #: ../src/vte.c:841 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 @@ -4496,327 +4660,321 @@ 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" +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 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" +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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Arquivos de projeto Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Executáveis" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Erro" - -#: ../src/win32.c:581 -#: ../src/win32.c:640 -msgid "Question" -msgstr "Pergunta" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Aviso" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Informação" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Construtor de Classe" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Cria arquivos-fonte para novos tipos de classe." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Criar Classe" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Classe" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Nome da classe:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Arquivo de cabeçalho:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Arquivo-fonte:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Herança" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Classe base:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Cabeçalho base:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "GType base:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Opções" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Criar construtor" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Criar destrutor" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Tipo de construtor GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "_Criar Classe" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "Classe _C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "Classe _GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caracteres HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Insere entidades de caracter HTML, como '&'" -#: ../plugins/htmlchars.c:48 -#: ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 -#: ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "A equipe de desenvolvimento do Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Caracteres HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Caracteres ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Caracteres gregos" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Caracteres matemáticos" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Caracteres técnicos" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Caracteres de seta" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Caracteres de pontuação" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Miscelânea de caracteres" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Caracteres Especiais" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Inserir" -#: ../plugins/htmlchars.c:467 -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: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:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Caracter" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (nome)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_Inserir Caracteres Especiais de HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "Substituição HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "_HTMLToggle" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Substituição em massa de caracteres especiais" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Inserir Caracteres Especiais HTML" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Substituir caracteres especiais" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Alternar estado do plugin" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Exportar" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exporta o arquivo atual para diversos formatos." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Exportar arquivo" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Usar nível atual de zoom" -#: ../plugins/export.c:193 -msgid "Renders the font size of the document together with the current zoom level" +#: ../plugins/export.c:185 +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:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Documento exportado com sucesso como '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "O arquivo '%s' não pôde ser gravado (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Exportar" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Como _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Como _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Navegador de Arquivos" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Inclui uma aba de navegação de arquivos na barra lateral." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Excesso de itens selecionados!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, 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:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Abrir _externamente" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Pesquisar em Arquivos" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Exibir Arquivos _Ocultos" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Cima" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Atualizar" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Home" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Definir caminho a partir do documento" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Limpar o filtro" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filtro:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Focar Lista de Arquivos" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Focar Entrada de Caminho" -#: ../plugins/filebrowser.c:1067 -#: ../plugins/saveactions.c:478 +#: ../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." @@ -4827,13 +4985,17 @@ #: ../plugins/filebrowser.c:1101 #, 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 msgid "Show hidden files" @@ -4844,42 +5006,48 @@ 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" +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 -msgid "Set the project's base directory" -msgstr "Definir o diretório base do projeto" +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" +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:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Salvar Ações" -#: ../plugins/saveactions.c:47 +#: ../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:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Cópia de backup: o diretório não pôde ser criado (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Cópia de backup: arquivo não pôde ser lido (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Cópia de backup: o arquivo não pôde ser salvo (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4887,297 +5055,409 @@ msgstr[1] "Auto-salvar: %d arquivos foram salvos automaticamente." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Selecionar Diretório" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Diretório de backup não existe ou não pode ser gravado." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Auto-Salvar" -#: ../plugins/saveactions.c:553 -#: ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Habilitar" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Intervalo de auto-salvar:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "segundos" -#: ../plugins/saveactions.c:578 +#: ../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:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Salvar somente o _arquivo atualmente aberto" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Sal_var todos os arquivos abertos" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Salvar Instantaneamente" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "Tipo de _arquivo a ser usado para novos arquivos abertos:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Cópia de Backup" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Diretório onde serão salvos os arquivos de backup" -#: ../plugins/saveactions.c:686 +#: ../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:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Níveis de diretório para inc_luir no destino do backup:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Dividir Janela" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Divide a janela do editor em duas janelas." -#: ../plugins/splitwindow.c:285 -#: ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Exibir o documento atual" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Anular divisão" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Dividir Janela" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Horizontalmente" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Verticalmente" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Dividir Horizontalmente" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Dividir Verticalmente" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 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." +#~ msgstr "" +#~ "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 "Show _Full Path Name" -#~ msgstr "Exibir Nome do Caminho _Completo" + #~ 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." @@ -5190,132 +5470,186 @@ #~ 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" @@ -5323,13 +5657,12 @@ #~ msgid "Complete construct" #~ msgstr "Criar construtor" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Suprimir completar construção" #~ 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 "" @@ -5339,8 +5672,10 @@ #, 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" @@ -5359,14 +5694,19 @@ #, 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" @@ -5375,16 +5715,22 @@ #~ 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 " @@ -5393,18 +5739,22 @@ #~ "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 /tmp/H5qKeNSrz8/geany-0.17/po/pt_PT.po /tmp/ssBwSf4GIv/geany-0.18/po/pt_PT.po --- geany-0.17/po/pt_PT.po 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/po/pt_PT.po 2009-08-16 17:18:28.000000000 +0100 @@ -0,0 +1,5159 @@ +# 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 /tmp/H5qKeNSrz8/geany-0.17/po/ro.po /tmp/ssBwSf4GIv/geany-0.18/po/ro.po --- geany-0.17/po/ro.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/ro.po 2009-08-16 17:18:28.000000000 +0100 @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.16\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2008-10-15 01:47+0200\n" "Last-Translator: Alex Eftimie \n" "Language-Team: Romanian\n" @@ -29,53 +29,53 @@ msgid "Integrated Development Environment" msgstr "Mediu de dezvoltare" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Despre Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Un IDE rapid și puțin consumator de resurse" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Informații" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Dezvoltatori" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "responsabil" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "dezvoltator" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "responsabil traducere" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Traducători" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Traducători precedenți" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Contribuitori" -#: ../src/about.c:340 +#: ../src/about.c:342 #, 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Mulțumiri" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licență" -#: ../src/about.c:389 +#: ../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." @@ -99,7 +99,7 @@ "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:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -108,132 +108,132 @@ "Nu am putut găsi terminalul \"%s\" (verificați calea pentru Terminal în " "Preferințe)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Procesul a eșuat (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (în dosarul: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Nu am putut schimba dosarul de lucru în \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Compilare eșuată" -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Compilare terminată cu succes." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Compilează" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Eroarea ur_mătoare" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Eroare a_nterioră" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "_Stabilește includeri și argumente" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_Vizualizează fișierul DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "V_izualizeză fișierul PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "_Stabilește parametri" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Stabilește parametri" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Creare DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Creare PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Previzualizare DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Previzualizare PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -242,71 +242,71 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Stabilește includeri și argumente" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Stabilește comenzile pentru construirea și executarea programelor." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "Comenzi pentru %s" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Compilare" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Construire:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Execuție:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 #, fuzzy msgid "Build the current file" msgstr "Compilează fișierul curent" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" -#: ../src/build.c:1976 +#: ../src/build.c:1967 #, 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:1979 +#: ../src/build.c:1970 #, 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:1982 +#: ../src/build.c:1973 #, fuzzy msgid "Compile the current file with Make" msgstr "Compilează fișierul curent" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Execuția programului de vizualizare a eșuat." -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Procesul nu a putut fi oprit (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Nu mai sunt erori de construire." @@ -314,8 +314,8 @@ msgid "Do you really want to quit?" msgstr "Sigur doriți să părăsiți programul?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Reîncarcă" @@ -328,54 +328,54 @@ 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:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Mergi la linia" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Introduceți linia la care doriți să mergeți:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "zz.ll.aaaa" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "ll.zz.aaaa" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "aaaa/ll/zz" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "zz.ll.aaaa oo:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "ll.zz.aaaa oo:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "aaaa/ll/zz oo:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Folosește format dată personalizat" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Format dată personalizat" -#: ../src/callbacks.c:1495 +#: ../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." @@ -383,24 +383,24 @@ "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:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Nu mai sunt mesaje." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Deschide fișier" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Vizualizare" -#: ../src/dialogs.c:150 +#: ../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." @@ -408,29 +408,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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Determină după extensie" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Determină din fișier" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "Opțiuni" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Arată fișierele _ascunse" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Stabilește codarea:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -440,11 +440,11 @@ msgstr "" #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Stabilește tipul de fișier:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -452,24 +452,33 @@ "filetype." msgstr "" -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "S_uprascrie" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Salvează fișier" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "R_edenumește" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 #, fuzzy msgid "Save the file and rename it" msgstr "Salvează fișierul și redenumește-l." -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Deschide fișierul într-un nou tab" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -478,24 +487,41 @@ "Păstrează deschis fișierul nesalvat curent și deschide proaspăt salvatul " "fișier într-un nou tab." -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Eroare" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Întrebare" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Avertizare" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informație" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Nu salva" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Fișierul '%s' nu este salvat." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Doriți să-l salvați înainte de a-l închide?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Alege font" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -503,106 +529,106 @@ "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:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "necunoscut" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Proprietăți" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Tip:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Dimensiune:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Locație:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Doar citire:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(numai în Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Codare:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(cu BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(fără BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Modificat:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Schimbat:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Accesat:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Permisiuni" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Citire:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Scriere" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Proprietar:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Grup:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Altul:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Fișierul %s a fost închis." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Fișierul nou \"%s\" a fost deschis." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Nu am putut deschide fișierul %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -618,12 +644,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:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Fișierul \"%s\" nu este un valid %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -631,49 +657,52 @@ msgstr "" "Fișierul\"%s\" nu arată ca un fișier text sau codarea nu este suportată." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Spații" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tab-uri" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Stabilesc modul de indentare %s pentru %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Nume de fișier invalid" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Fișierul %s a fost reîncărcat." -#: ../src/document.c:1354 +#. 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 "Fișierul %s a fost deschis(%d%s)" -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", doar-citire" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "Eroare la salvarea fișierului." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -682,7 +711,7 @@ "O eroare s-a produs la conversia fișierului din UTF-8 în \"%s\". Fișierul " "rămâne nesalvat." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -691,41 +720,41 @@ "Mesaj de eroare: %s\n" "Eroarea s-a produs la \"%s\" (linia: %d, coloana: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Mesaj de eroare: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Eroare la salvarea fișierului." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Eroare la salvarea fișierului (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Fișierul %s a fost salvat." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" nu a fost găsit." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Nu am găsit nici o potrivire pentru \"%s\"." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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\"." @@ -733,11 +762,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:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Doriți să-l reîncărcați?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -746,32 +775,20 @@ "Fișierul '%s' de pe disc este mai recent decât\n" "tamponul curent." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Încearcă să salveze din nou fișierul?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Fișierul \"%s\" nu a fost găsit!" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Introduceți lățimea tabului" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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." @@ -873,134 +890,123 @@ msgstr "Chineză tradițională" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japoneză" -#: ../src/encodings.c:141 ../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 "Koreană" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Fără codare" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Vest europeană" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Este europeană" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "_Asia de est" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "Asia de _SE & SV" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Orientul mijlociu" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Nimic" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Sursă %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, 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 +msgid "None" +msgstr "Nimic" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Script consolă" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Fișier make" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Document XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Stiluri în cascadă" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "Fișier SQL Dump" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Fișier diff" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Fișier configurare" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Fișier traducere gettext" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "Fișier script %s" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Fișier reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Limbaje de _programare" # FUZZY -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Limbaje de _scripting" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Limbaje de pre_zentare" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Limbaje di_verse" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Toate fișierele" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Expresie regulată greșită pentru tipul de fișier %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "fără titlu" @@ -1014,8 +1020,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "invizibil" @@ -1023,7 +1029,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Deschide fi_șierul selectat" @@ -1043,11 +1049,11 @@ msgid "Page Set_up" msgstr "Setări pa_gină" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Închide celelal_te fișiere" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Înc_hide toate" @@ -1055,85 +1061,81 @@ msgid "_Edit" msgstr "_Editare" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Selecte_ază tot" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "F_ormat" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "" # FUZZY -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Comentează linia/liniile" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Decome_ntează linia/liniile" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "_Comută comentarea liniilor" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "_Mărește indentarea" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Mi_cșorează indentarea" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "Trimite _selecția la" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "Trimite _selecția la" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "I_nserează comentarii" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Inserează intrare _ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Inserează _antet fișier" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Inserează descrierea _funcției" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Inserează comentariu _multi-linie" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Inserează notiță GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Insereză notiță licență _BSD" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "In_serează dată" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "_Inserează \"include <...>\"" @@ -1158,7 +1160,7 @@ msgid "Find in F_iles" msgstr "Caută în f_ișiere" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Î_nlocuiește" @@ -1178,7 +1180,7 @@ msgid "Pr_evious Message" msgstr "Mesajul ant_erior" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Mer_gi la linia" @@ -1206,7 +1208,7 @@ msgid "Show Side_bar" msgstr "Arată bara _laterală" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1254,15 +1256,15 @@ msgid "In_dent Type" msgstr "Tip in_dentare" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tab-uri" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Spații" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_ab-uri și spații" @@ -1384,7 +1386,7 @@ msgid "_Debug Messages" msgstr "Mesaje _depanare" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Simboluri" @@ -1408,74 +1410,80 @@ msgid "Scribble" msgstr "" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Imagini _și text" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Doar _imagini" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Doar _text" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Icon-uri _mari" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Icon-uri m_ici" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "Icon-uri m_ici" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" +msgstr "_Ascunde bara de unelte" + +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" msgstr "_Ascunde bara de unelte" # FUZZY -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Caută f_olosiri" # FUZZY -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Caută folosiri în _document" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Mergi la definiția e_tichetei" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Mergi la decl_arearea etichetei" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Acțiune conte_xtuală" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Preferințe" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Încarcă fișierele din ultima sesiune" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Deschide la pornire fișierele din ultima sesiune" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Încarcă suport pentru terminal virtual" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1484,40 +1492,40 @@ "Dacă suportul pentru emularea consolei virtuale să fie încărcat. Dezactivați-" "l dacă nu-l folosiți." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Activează suport pentru module" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Pornire" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Salveză poziția și geometria ferestrei" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Confirmă ieșirea" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Arată un dialog de confirmare la ieșire." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Închidere" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Cale de pornire:" -#: ../src/interface.c:2758 +#: ../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." @@ -1525,40 +1533,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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Fișierele proiectului:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Calea de pornire la deschidere fișierelor de proiect" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 #, fuzzy msgid "Extra plugin path:" msgstr "Activează suport pentru module" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Căi" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 #, fuzzy msgid "Startup" msgstr "Stare" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Bipăie la erori sau la sfârșitul compilării" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1567,11 +1575,11 @@ "Dacă programul să bipăie la producerea de erori sau la sfârșitul procesului " "de compilare." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Comută la lista de mesaje de stare la un mesaj nou" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1580,11 +1588,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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Suprimă mesajele de stare în bara de stare" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1592,36 +1600,37 @@ "Șterge toate mesajele din bara de stare. Mesajele sunt totuși afișate în " "fereastra de mesaje de stare." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Focalizeză automat controalele (focusul urmărește mouse-ul)" -#: ../src/interface.c:2866 +#: ../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 "" -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Diverse" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "" -#: ../src/interface.c:2891 +#: ../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:2893 +#: ../src/interface.c:2913 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:2896 +#: ../src/interface.c:2916 #, fuzzy msgid "" "Use current word under the cursor when opening the Find, Find in Files or " @@ -1630,20 +1639,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:2898 +#: ../src/interface.c:2918 #, 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Căutare" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Folosește fișiere de sesiune bazate pe proiect" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " @@ -1652,11 +1661,11 @@ "Dacă să salveze fișierele de sesiune ale proiectului și să le redeschidă o " "dată cu acesta." -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Salvează fișierul proiect în dosarul de bază al proiectului" -#: ../src/interface.c:2929 +#: ../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 " @@ -1664,76 +1673,76 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Proiect" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 #, fuzzy msgid "Miscellaneous" msgstr "Diverse" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "General" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Arată lista de simboluri" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Comută vizibilitatea listei de simboluri" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Arată lista de documente" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Comută vizibilitatea listei de documente" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Bară laterală" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Listă simboluri:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Fereastra de mesaje:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Stabilește font-ul ferestrei de mesaje" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Stabilește font-ul listei de simboluri" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Stabilește font-ul editorului" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Font-uri" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Arată tab-uri în editor" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Arată butoane de închidere" -#: ../src/interface.c:3064 +#: ../src/interface.c:3084 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1742,109 +1751,114 @@ "Arată o cruciuliță în tab-urile de fișiere pentru închiderea rapidă prin " "click (necesită repornirea Geany)." -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Poziționarea tab-urilor de fișier nou:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Stânga" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Dreapta" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Comută toate controalele adiționale" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Comută toate controalele adiționale" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Tab-uri editor" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Sus" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Jos" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Bară laterală:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Poziții tab-uri" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Arată bara de stare" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 #, 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Interfață" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "Arată bară de unelte" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Bară de unelte" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Stil iconițe:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Dimensiune iconițe:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Aspect" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Arată _bara de unelte" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Bară de unelte" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Încadrare linii" -#: ../src/interface.c:3349 +#: ../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 " @@ -1854,11 +1868,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:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Activează tastă acasă \"inteligentă\"" -#: ../src/interface.c:3354 +#: ../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 " @@ -1873,30 +1887,30 @@ "liniei curente, indiferent de poziția curentă a acestuia." # FUZZY -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Dezactivează trage și plasează" -#: ../src/interface.c:3359 +#: ../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 "" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Activează restrângerea/extinderea" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Activează restrângerea respectiv extinderea codului" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 #, 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:3369 +#: ../src/interface.c:3413 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1906,11 +1920,11 @@ "Shift când se dă click pe un simbol de restrângere, este utilizat " "comportamentul contrar." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Folosește indicatori pentru a arăta erorile de compilare" -#: ../src/interface.c:3374 +#: ../src/interface.c:3418 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1919,91 +1933,91 @@ "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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Linia nouă șterge dâra de spații" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 #, 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:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 #, fuzzy msgid "Comment toggle marker:" msgstr "Marcaj linie lungă:" -#: ../src/interface.c:3406 +#: ../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 "" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Funcții" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Funcții" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Mod indentare automată" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Fundamental" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Caractere curente" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Potrivește paranteze" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Tip:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Lățime:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "Lățimea în caractere a indentării" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Folosește spații la indentare" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Folosește indentare la un tab" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" "Folosește spații dacă indentarea totală este mai mică decât lătimea tab-" "ului, altfel amândouă" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 #, fuzzy msgid "Hard tab width:" msgstr "Lățime tab:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " @@ -2012,59 +2026,60 @@ "Dacă să detectez tipul de indentare din conținutul fișierului la deschiderea " "acestuia." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 #, fuzzy msgid "Tab key indents" msgstr "Indentare inteligentă" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Indentare" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 #, fuzzy msgid "Indentation" msgstr "Indentare" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "" -#: ../src/interface.c:3581 +#: ../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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "Completare automată etichete XML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Completare automată și închiderea etichetelor XML (include etichetele HTML)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3591 +#: ../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 "" -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "Completare automată simboluri" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2072,143 +2087,152 @@ "Completarea automată a simbolurilor cunoscute în fișierele deschise (nume de " "funcții, variabile globale, ...)" -#: ../src/interface.c:3604 +#: ../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 "" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Caractere de tastat pentru completarea automată:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 #, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" "Câte caractere sunt necesare pentru a arăta lista de completarea automată a " "simbolurilor." -#: ../src/interface.c:3640 +#: ../src/interface.c:3692 #, fuzzy -msgid "Display height in rows for the auto completion list" +msgid "Display height in rows for the autocompletion list" msgstr "Număr de rânduri pentru lista de completarea automată." -#: ../src/interface.c:3649 +#: ../src/interface.c:3701 #, fuzzy -msgid "Maximum number of entries to display in the auto completion list" +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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Completări" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Completări" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Inversează culorile de evidențiere" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Arată ghidări indentare" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 #, 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Arată spațiu albe" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 #, 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:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Arată sfârșiturile de linie" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "Arată caracterul de sfârșit de linie" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 #, fuzzy msgid "Show line numbers" msgstr "Arată numerele de _linie" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Arată sau ascunde marginea cu numere de linie." -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 #, fuzzy msgid "Show markers margin" msgstr "Arată _marginile de marcare" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2217,114 +2241,114 @@ "Comută marginea din dreapta numerelor de linie, folosită pentru marcarea " "liniilor." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Afișare" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Marcaj linie lungă:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Culoare marcaj linie lungă:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Stabilește culoarea marcajului de linie lungă" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../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 culoare" -#: ../src/interface.c:3826 +#: ../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 "" -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Linie" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Fundal" -#: ../src/interface.c:3846 +#: ../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 "" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Dezactivat" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Marcaj linie lungă" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Afișare" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Caracter sfârșit de linie implicit:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Fișiere noi" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Codare implicită (fișiere noi):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Codare implicită (fișiere existente):" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "Stabilește codarea implicită pentru deschiderea fișierelor existente." -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Folosește codare fixă la deschiderea de fișiere" -#: ../src/interface.c:3978 +#: ../src/interface.c:4030 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " @@ -2335,81 +2359,81 @@ "deschiderea fișierelor și deschide fișierul cu codarea specificată (nu este " "necesară în mod normal)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Codări" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Asigură linie nouă la sfârșitul fișierului" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Elimină dâra de spații" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Înlocuiește tab-urile cu spații" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Înlocuiește toate tab-urile în document cu spații." -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Salvare fișiere" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Lungime listă fișiere recente:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 #, 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Fișiere" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Navigator:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Calea și upțiunile utilitarului make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2417,23 +2441,23 @@ "Un emulator de terminal ca xterm, gnome-terminal sau konsole (trebuie să " "accepte parametrul -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Calee (eventual parametrii adiționali) către navigatorul favorit" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Căi unelte" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Acțiune contextuală:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2443,67 +2467,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:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Comenzi" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Unelte" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "adresa email a dezvoltatorului" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Inițialele dezvoltatorului" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Versiunea inițială:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 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:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Nume companie" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Dezvoltator:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Companie:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Adresă mail:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Inițiale:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Numele dezvoltatorului" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "An:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Data:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Data & ora:" -#: ../src/interface.c:4382 +#: ../src/interface.c:4434 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2512,7 +2536,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:4389 +#: ../src/interface.c:4441 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2521,7 +2545,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:4396 +#: ../src/interface.c:4448 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2530,55 +2554,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:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Date șablon" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Șabloane" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "Sc_himbă" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Scurtături" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Combinații de taste" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Comandă:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Folosește o comandă externă pentru imprimare" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Imprimă numere de linie" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Adaugă numerele de linie la pagina imprimată" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Imprimă numerele de pagină" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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." @@ -2586,11 +2610,11 @@ "Adaugă numerele de pagină la baza fiecărei pagini. Ocupă două linii din " "pagină." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Imprimă antetul paginii" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../src/interface.c:4575 ../src/printing.c:392 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2599,564 +2623,583 @@ "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:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Folosește numele fișierului imprimat" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 #, 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Format dată:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 "" -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Folosește imprimare GTK nativă" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Imprimare" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Proprietăți proiect" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Fișier" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Nou" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Deschide" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Deschide fișierul selectat" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Salvează" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Salvează ca" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Salvează toate" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Imprimă" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Închide" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Închide toate" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Reîncarcă fișier" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Proiect" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Proprietăți proiect" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Refă" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Repetă" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Duplică linia sau selecția" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Șterge liniile curente" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, 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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Acțiune contextuală" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Completează cuvânt" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Arată lista de macrocomenzi" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Taie" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Copiază" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Lipește" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Copiază liniile curente" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Taie liniile curente" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Selectează" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Selectează tot" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Selectează cuvântul curent" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Selectează liniile curente" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Selectează paragraful curent" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Comentează liniile" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Decomentează liniile" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Mărește indentarea" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Micșorează indentarea" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Indentare inteligentă" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Trimite la comanda personalizată 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Trimite la comanda personalizată 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Trimite la comanda personalizată 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "Trimite _selecția la" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Inserează" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Inserează dată" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 #, fuzzy msgid "Insert alternative white space" msgstr "Inserează spațiu alb alternativ" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Setări" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Căutare" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Caută" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Caută următor" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Caută precedent" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Caută selecția următoare" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Caută selecția precedentă" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Înlocuiește" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Caută în fișiere" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Mesajul următor" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Mesajul anterior" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Caută folosiri" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 #, fuzzy msgid "Find Document Usage" msgstr "Caută folosiri" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Sa_lvează tot" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Mergi la" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Mergi înapoi cu o locație" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Mergi înainte cu o locație" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Mergi la definiția etichetei" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Mergi la declarația etichetei" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Mergi la începutul liniei" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Mergi la finalul liniei" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Mergi la finalul liniei" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Comută toate controalele adiționale" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Ecran complet" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Comută fereastra de mesaje" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Comută bara laterală" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Mărește" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Micșorează" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Focalizează" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Treci la editor" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Treci la scribble" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Treci la VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Treci la bara de căutare" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Treci la bara laterală" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Comută la compilator" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Treci la documentul din stânga" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Treci la documentul din dreapta" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Treci la ultimul document folosit" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Mută documentul în stânga" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Mută documentul în dreapta" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Mută documentul la început" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Mută documentul la final" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Document" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 #, fuzzy msgid "Toggle Line wrapping" msgstr "Încadrare linii" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 #, fuzzy msgid "Toggle Line breaking" msgstr "Încadrare linii" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 #, fuzzy msgid "Replace spaces by tabs" msgstr "Î_nlocuiește tab-urile cu spații" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 #, fuzzy msgid "Toggle current fold" msgstr "Selectează cuvântul curent" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Restrânge toate" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Extinde toate" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Reîncarcă lista de simboluri" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Construiește" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Compilează" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Eroarea următoare" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Eroarea anterioară" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Rulează" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Rulează (comandă alternativă)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Opțiuni construcție" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Arată Selector culoare" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Ajutor" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Scurtături" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Următoarele scurtături sunt configurabile:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 #, fuzzy msgid "Switch to Document" msgstr "Treci la documentul din stânga" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Încărcarea unuia sau mai multor fișiere de sesiune eșuată." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Mesaje depanare" @@ -3214,8 +3257,8 @@ msgstr "Afișează prefixul de instalare al Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "nu încărca fișierele din sesiunea anterioară" +msgid "Don't load the previous session's files" +msgstr "Nu încărca fișierele din sesiunea anterioară" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3229,24 +3272,24 @@ msgid "Show version and exit" msgstr "Arată versiunea și ieși" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[FIȘIERE...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3255,14 +3298,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3273,22 +3316,22 @@ "Ar putea fi probleme la rularea Geany fără un dosar de configurație.\n" "Porniți oricum Geany?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Acesta este Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Dosarul de configurație nu a putut fi creat (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Fișierele de configurare au fost reîncărcate" @@ -3305,7 +3348,7 @@ msgid "_Hide Message Window" msgstr "_Ascunde fereastra de mesaje" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3314,11 +3357,11 @@ "Modulul \"%s\" nu este compatibil binar cu această versiune de Geany - vă " "rugăm compilați-l din nou." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Manager _module" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3329,23 +3372,23 @@ "Descriere: %s\n" "Autor(i): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Activ" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Modul" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Nu există module disponibile." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Module" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3353,51 +3396,61 @@ "Mai jos este o listă de module disponibile. Selectați modulele care ar " "trebui încărcate la pornirea Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Detalii modul:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Acțiune" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Scurtătură" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Înhață tasta" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +#, fuzzy +msgid "_Expand All" +msgstr "Găsește to_ate" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +#, fuzzy +msgid "_Collapse All" +msgstr "Înc_hide toate" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Acțiune" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Scurtătură" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "S_uprascrie" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Suprascrieți combinația de taste?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Combinația '%s' este deja în uz pentru \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3405,7 +3458,7 @@ "Stabiliți informația folosită în șabloane. Vedeți documentația pentru " "detalii." -#: ../src/prefs.c:1458 +#: ../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." @@ -3416,7 +3469,7 @@ "configurația." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3427,68 +3480,69 @@ "click pe o acțiune și editați direct reprezentarea ca șir a scurtăturii." #. page Printing -#: ../src/prefs.c:1469 +#: ../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 "" -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -#: ../src/printing.c:270 +#: ../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 "Pagina %d din %d" # FUZZY -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Setare document" -#: ../src/printing.c:375 +#: ../src/printing.c:410 #, 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:491 +#: ../src/printing.c:526 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Pagina %d din %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Imprimarea fișierului %s a fost revocată." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Fișierul %s a fost imprimat." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Imprimarea lui %s a eșuat (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 #, 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:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3499,7 +3553,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Imprimarea \"%s\" a eșuat (cod returnat: %s)." @@ -3518,19 +3572,19 @@ msgid "C_reate" msgstr "C_rează" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Nume:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Nume fișier:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Cale de bază:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3540,121 +3594,121 @@ "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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Alegeți calea de bază a proiectului" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Fișierul proiect \"%s\" nu a putut fi încărcat." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Deschide proiect" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Fișiere proiect" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Proiectul \"%s\" a fost închis." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Descriere:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Comandă rulare:" -#: ../src/project.c:457 +#: ../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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Modele fișier:" -#: ../src/project.c:574 +#: ../src/project.c:578 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:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Proiectul '%s' este deja deschis." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Numele de proiect specificat este prea scurt" -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Ați ales un nume de proiect invalid." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Creez dosarul cale de bază al proiectului?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Calea \"%s\" nu există." -#: ../src/project.c:666 +#: ../src/project.c:670 #, 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:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Fișierul proiect nu a putut fi scris (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Proiectul \"%s\" a fost creat." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Proiectul \"%s\" a fost salvat." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Alegeți numele fișierului proiect" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Alegeți comanda de rulare a proiectului" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Proiectul \"%s\" a fost deschis." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "F_olosește expresii regulate" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3662,15 +3716,15 @@ "Folosește expresii regulate POSIX. Pentru informații detaliate despre " "folosirea expresiilor regulate, citiți documentația" -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Caută îna_poi" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Folosește s_ecvențe întârziate" -#: ../src/search.c:231 +#: ../src/search.c:246 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3679,134 +3733,134 @@ "Înlocuiește \\\\, \\t, \\n, \\r și \\uXXXX (caractere Unicode) cu " "caracterele de control corespunzătoare." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Ma_juscule semnificative" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Potrivește numai cu_vinte întregi" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Potriveș_te numai de la începutul cuvântului" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "A_nterior" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Următor" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Caută după:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "Găsește to_ate" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Marchează" -#: ../src/search.c:418 +#: ../src/search.c:433 #, fuzzy msgid "Mark all matches in the current document" msgstr "Marchează toate potrivirile în documentul curent." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "În _sesiune" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "_În document" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Închide _dialogul" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Dezactivați aceast opțiune pentru a ține dialogul deschis." -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Î_nlocuiește & Caută" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Înlocuiește c_u:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Înlocuie_ște peste tot" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "În se_lecție" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Înlocuiește toate potrivirile din textul selctat curent" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Dosar:" -#: ../src/search.c:712 +#: ../src/search.c:727 #, fuzzy msgid "E_ncoding:" msgstr "Stabilește codarea:" # FUZZY -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Ș_iruri fixe" # FUZZY -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Expresii regulate Grep" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 #, 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:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Expresii regulate extinse" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Pa_rcurge recursiv subdirectoarele" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Inversează rezultatele căutării" -#: ../src/search.c:782 +#: ../src/search.c:797 #, 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:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Opțiuni e_xtra:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Alte opțiuni pentru Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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\"." @@ -3814,7 +3868,7 @@ msgstr[1] "Am găsit %d potriviri \"%s\"." msgstr[2] "Am găsit %d potriviri \"%s\"." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, c-format msgid "Replaced text in %u file." msgid_plural "Replaced text in %u files." @@ -3822,41 +3876,41 @@ msgstr[1] "Am înlocuit textul în %u fișiere." msgstr[2] "Am înlocuit textul în %u fișiere." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Dosar invalid pentru căutare în fișiere." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Nici un text de căutat." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 #, fuzzy msgid "Searching..." msgstr "Căutare" -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (în dosar: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Nu am putut deschide dosarul (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -3864,231 +3918,241 @@ msgstr[1] "Căutare finalizată cu %d potriviri." msgstr[2] "Căutare finalizată cu %d potriviri." -#: ../src/search.c:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Nici o potrivire nu a fost găsită." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Capitol" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Secțiune" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sect1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sect2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sect3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Anexă" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Altul" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Tipuri" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Constructori tip" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Funcții" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Secțiuni" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Chei" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Variabile" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Comandă" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Mediu" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Subsecțiune" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Subsubsecțiune" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Etichetă" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 #, fuzzy msgid "Structures" msgstr "Stare" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Pachet" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Interfețe" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Clase" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Constante" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 #, fuzzy msgid "Anchors" msgstr "Ancoră" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 #, fuzzy msgid "H1 Headings" msgstr "Antet (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 #, fuzzy msgid "H2 Headings" msgstr "Antet (H1)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 #, fuzzy msgid "H3 Headings" msgstr "Antet (H1)" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 #, fuzzy msgid "ID Selectors" msgstr "În se_lecție" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 #, fuzzy msgid "Type Selectors" msgstr "Constructori tip" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Module" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Metode" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Spațiu de nume" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Proprietăți" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Exportă" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Membri" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Etichete" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Subrutine" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Blocuri" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Macrocomenzi" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Constante" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Ținte" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Spațiu de nume" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 #, fuzzy msgid "Structs" msgstr "Stare" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Extensie necunoscută pentru \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4097,7 +4161,7 @@ "Folosire: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4108,115 +4172,101 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Încarcă etichete" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Am încărcat %s fișier de etichete '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Nu am putut încărca fișierul de etichete '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Nu am găsit definiția \"%s\"." -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "Găsește to_ate" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "Înc_hide toate" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Sortează după _nume" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Sortează după _apariție" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Salvează fișierul curent" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "Sa_lvează tot" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Salvează toate fișierele deschise" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Reîncarcă fișierul curent de pe disc" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Închide fișierul curent" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 #, fuzzy msgid "Close all open files" msgstr "Închide toate fișierele deschide" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 #, fuzzy msgid "Cut the current selection" msgstr "Taie liniile curente" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 #, fuzzy msgid "Copy the current selection" msgstr "Compilează fișierul curent" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 #, fuzzy msgid "Delete the current selection" msgstr "Șterge liniile curente" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Anulează ultima modificare" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Reface ultima modificare" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Compilează fișierul curent" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Execută sau vizualizează fișierul curent" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" @@ -4225,64 +4275,86 @@ "culori dintr-o paletă." # FUZZY -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Mărește textul" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Micșorează textul" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Micșorează indentarea" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Mărește indentarea" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Caută textul introdus în fișierul curent" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 #, fuzzy msgid "Jump to the entered line number" msgstr "Sari la numărul de linie introdus." -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Părăsește Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "Document XML" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Marchează toate potrivirile în documentul curent." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Crează un fișier nou" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Deschide un fișier existent" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 #, fuzzy msgid "Goto" msgstr "Mergi la" +#: ../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 "Afișare" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4347,125 +4419,147 @@ msgid "Characters:" msgstr "Caractere:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Nu am găsit etichete" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Arată lista de s_imboluri" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Arată lista de _documente" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Ascun_de bara laterală" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Arată calea com_pletă" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "mod: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "codare: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "tip fișier: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Font actualizat (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Biblioteca standard C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Biblioteca standard C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Biblioteca standard C++" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Stabilește format personalizat dată" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Selectați dosar" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Selectați fișier" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 #, fuzzy msgid "C_onfiguration Files" msgstr "Fișierele de configurare au fost reîncărcate" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +#, fuzzy +msgid "Save All" +msgstr "Sa_lvează tot" + +#: ../src/ui_utils.c:1786 #, fuzzy msgid "Close All" msgstr "Înc_hide toate" +#: ../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 "Terminal" @@ -4645,161 +4739,145 @@ "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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Fișiere de proiect Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Executabile" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Eroare" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Întrebare" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Avertizare" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Informație" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Constructor clasă" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Crează fișiere sursă pentru noile tipuri de clase." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Crează clasă" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Clasă" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Nume clasă:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Fișier antet:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Fișier sursă:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Moștenire" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Clasă de bază:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Antet de bază:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "GType de bază:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Opțiuni" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Crează constructor" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Crează destructor" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Tip constructor GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Crează cla_să" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "Clasă _C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "Clasă _GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Caractere HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Inserează entități HTML precum '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Echipa dezvoltatorilor Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Caractere HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Caractere ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Caractere grecești" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Operatori matematici" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Caractere tehnice" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Săgețele" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Semne de punctuație" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Caractere diverse" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Caractere speciale" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Inserează" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4807,159 +4885,159 @@ "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:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Caracter" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (cuvântul)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "_Inserează caracter HTML special" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "Înlocuiește" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Poziționarea tab-urilor de fișier nou:" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Inserează caracter HTML special" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "Caractere speciale" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Exportă" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exportă fișierul curent în diferite formate." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Exportă fișier" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Folosește nivelul curent de zoom" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 #, fuzzy msgid "" "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:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Documentul a fost exportat cu succes ca '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Fișierul '%s' nu a putut fi scris (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Exportă" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Ca _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Ca _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Navigator fișiere" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Adaugă un tab navigator fișiere la bara laterală." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Prea mulți itemi selectați!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Nu am putut executa comanda externă '%s' (%s)." -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Deschide _extern" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Caută în fișiere" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Arată fișierele a_scunse" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Sus" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Reîmprospătare" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Acasă" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Stabilește calea din document" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Elimină filtrul" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filtru:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Focalizează lista de fișiere" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Focalizează introducerea căii" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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." @@ -4999,7 +5077,7 @@ #: ../plugins/filebrowser.c:1128 #, fuzzy -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "Creez dosarul cale de bază al proiectului?" #: ../plugins/filebrowser.c:1132 @@ -5008,31 +5086,31 @@ "Change the directory to the base directory of the currently opened project" msgstr "Fă diff de la directorul fișierului activ" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Acțiuni salvare" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "Acest modul oferă acțiuni diferite legat€ de salvarea fișierelor." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Copie de siguranță: Dosarul nu a putut fi creat (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Copie de siguranță: Fișierul nu a putut fi citit (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Copie de siguranță: Fișierul nu a putut fi salvat (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5041,109 +5119,126 @@ msgstr[2] "Salvare automată: %d fișiere au fost salvate." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Selectați dosar" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Dosarul copii de siguranță nu există sau nu poate fi scris." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Salvare automată" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Activează" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Interval salvare automată:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "secunde" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "_Afișează mesaj de stare la salvarea automată a fișierelor." -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Salvează numai _fișierul deschis curent" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "S_alvează toate fișierele deschise" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Salvare instantanee" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "Tip de _fișier folosit pentru fișierele nou deschise:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Copie de siguranță" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Dosar copii de siguranță:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" "Format Dată/_Timp pentru copiile de siguranță (\"man strftime\" pentru " "detalii:" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "" "Nive_luri de directoare pentru includerea în destinația copiei de siguranță:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Împarte fereastra" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Împarte vizualizarea editorului în două ferestre." -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Marchează toate potrivirile în documentul curent." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 #, fuzzy msgid "_Unsplit" msgstr "_Reunește" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "Î_mparte fereastra" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Orizontal" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 #, fuzzy msgid "Split Horizontally" msgstr "_Orizontal" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 #, fuzzy msgid "Unsplit" msgstr "_Reunește" +#~ msgid "Diff file" +#~ msgstr "Fișier diff" + +#~ msgid "reStructuredText file" +#~ msgstr "Fișier reStructuredText" + +#~ msgid "Select _All" +#~ msgstr "Selecte_ază tot" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Completare automată simboluri" + #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Nu am putut vizualiza %s (asigurați-vă că este deja compilat)" @@ -5398,9 +5493,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Structuri / Definiții de tip" -#~ msgid "Show _Full Path Name" -#~ msgstr "Arată calea com_pletă" - #~ msgid "Terminal emulation:" #~ msgstr "Emulare terminal:" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/ru.po /tmp/ssBwSf4GIv/geany-0.18/po/ru.po --- geany-0.17/po/ru.po 2009-04-26 20:17:08.000000000 +0100 +++ geany-0.18/po/ru.po 2009-08-16 17:18:28.000000000 +0100 @@ -8,10 +8,10 @@ # John Wehin , 2009 msgid "" msgstr "" -"Project-Id-Version: Geany 0.17\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-26 21:08+0200\n" -"PO-Revision-Date: 2009-04-26 15:47+0400\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"PO-Revision-Date: 2009-08-06 06:38+0400\n" "Last-Translator: John Wehin \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -20,7 +20,6 @@ "X-Poedit-Language: Russian\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-Basepath: ../\n" -"X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -36,68 +35,68 @@ msgid "Integrated Development Environment" msgstr "Интегрированная среда разработки" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "О Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Быстрая и легковесная среда разработки" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(собрано %s или позднее)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Информация" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Разработчики" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "ведущий разработчик" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "разработчик" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "ведущий переводчик" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "переводчики" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Предыдущие переводчики" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Участники" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Некоторые из многих участников проекта (более детальный список в файле %s):" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "О нас" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Лицензия" -#: ../src/about.c:389 +#: ../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." @@ -105,7 +104,7 @@ "Текст лицензии не найден, пожалуйста посетите http://www.gnu.org/licenses/" "gpl-2.0.txt, чтобы ознакомиться с ним." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -113,130 +112,130 @@ msgstr "" "Не могу найти терминал \"%s\" (проверьте путь для терминала в Настройках)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Ошибка запуска \"%s\" (стартовый скрипт не может быть создан)" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Процесс дал сбой (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (в каталоге: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Не могу сменить рабочий каталог на \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" "Невозможно запустить файл в VTE, так как он, возможно, содержит команду." -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Сборка завершилась с ошибкой." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Сборка прошла успешно." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Скомпилировать" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 msgid "_Build" msgstr "С_борка" #. build the code with make all -#: ../src/build.c:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Собрать свою цель" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Сборка _объекта" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Следующая ошибка" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "_Предыдущая ошибка" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "_Параметры сборки" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "_Просмотреть DVI файл" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "_Просмотреть PDF файл" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "Установить _аргументы" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Установить аргументы" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "Установить программы и опции для сборки и просмотра (La)TeX файлов." -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Создание DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Создание PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Предварительный просмотр DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Предварительный просмотр PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -245,69 +244,69 @@ "%f будет заменено на текущее имя файла, например: test_file.c\n" "%e будет заменено на имя файла без расширения, т.е. test_file" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Установить \"include <...>\" и аргументы" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Установить команды для сборки и запуска програм." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s команд" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Скомпилировать:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Собрать:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Выполнить:" # Скомпилировать? -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Собрать текущий файл" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Собрать свою цель" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Введите здесь свои опции, весь введенный текст передается команде make." -#: ../src/build.c:1976 +#: ../src/build.c:1967 msgid "Build the current file with Make and the default target" msgstr "Собрать данный файл используя make и цель сборки по умолчанию" -#: ../src/build.c:1979 +#: ../src/build.c:1970 msgid "Build the current file with Make and the specified target" msgstr "Собрать текущий файл, используя make и указанную цель" -#: ../src/build.c:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Скомпилировать текущий файл, используя make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Невозможно запустить программу просмотра" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Процесс невозможно остановить (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Ошибок сборки больше нет." @@ -315,8 +314,8 @@ msgid "Do you really want to quit?" msgstr "Вы действительно хотите выйти?" -#: ../src/callbacks.c:469 ../src/document.c:2902 ../src/interface.c:340 -#: ../src/treeviews.c:554 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Обновить" @@ -329,54 +328,54 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Вы уверены, что хотите обновить '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Перейти на строку" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Введите строку, на которую перейти:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Пожалуйста, установите тип файла для текущего документа перед использованием " "этой функции." -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "дд.мм.гггг" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "мм.дд.гггг" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "гггг/мм/дд" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "дд.мм.гггг час:мин:сек" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "мм.дд.гггг час:мин:сек" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "гггг/мм/дддд час:мин:сек" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Использовать свой формат даты" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Свой формат даты" -#: ../src/callbacks.c:1495 +#: ../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." @@ -384,25 +383,25 @@ "Введите свое описание формата даты и времени. Вы можете использовать любые " "параметры конверсии, применимые к функции strftime ANSI C." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Невозможно конвертировать строку формата даты (возможно, слишком длинная)" -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Сообщений больше нет." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Открыть файл" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "Вид" -#: ../src/dialogs.c:150 +#: ../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." @@ -410,28 +409,28 @@ "Открытие файла в режиме \"только чтение\". Если выбрать более чем один файл " "для открытия, все выбранные файлы будут открыты в режиме \"только чтение\"." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Распознать по расширению файла " -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Распознать по содержимому" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "_Больше опций" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Показывать скрытые файлы" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Кодировка:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -445,11 +444,11 @@ "будут открыты в выбранной кодировке." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Тип файла:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -461,23 +460,31 @@ "Внимание: Если Вы выбрали несколько файлов, они будут открыты с выбранным " "типом файла." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Перезаписать?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Файл с таким именем уже существует!" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Сохранить Файл" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Переи_меновать" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Сохранить и переименовать файл." -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "Открыть файл _в новой вкладке" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -485,24 +492,41 @@ "Оставить текущий документ не сохраненным, а вновь сохраненный открыть в " "новой вкладке." -#: ../src/dialogs.c:622 +#: ../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 "_Не сохранять" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Файл \"%s\" не сохранен." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Сохранить файл до закрытия?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Выбрать шрифт" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -510,106 +534,106 @@ "Произошла ошибка или информация о файле не может быть получена (например, " "новый файл)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1668 ../src/symbols.c:1689 ../src/symbols.c:1741 -#: ../src/ui_utils.c:222 +#: ../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 "неизвестный" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Свойства" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Тип:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Размер:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Размещение:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Только чтение:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(только внутри Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Кодировка:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(с BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(без BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Модифицирован:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Изменен:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Последний доступ:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Права:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Чтение:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Запись:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Владелец:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Группа:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Прочие:" -#: ../src/document.c:678 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Файл '%s' закрыт." -#: ../src/document.c:795 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Открыт новый файл \"%s\"." -#: ../src/document.c:968 ../src/document.c:1474 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Невозможно открыть файл %s (%s)" -#: ../src/document.c:998 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -624,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:1024 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файл \"%s\" не является корректным %s" -#: ../src/document.c:1034 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -638,48 +662,51 @@ "Файл \"%s\" не похож на текстовой или такая кодировка файла не " "поддерживается." -#: ../src/document.c:1172 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Пробелы" -#: ../src/document.c:1175 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Табуляция" -#: ../src/document.c:1178 +#: ../src/document.c:1128 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:1183 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Устанавливаю режим отступа %s для %s." -#: ../src/document.c:1236 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Неправильное имя файла" -#: ../src/document.c:1356 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Файл %s обновлен." -#: ../src/document.c:1358 +#. 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 "Файл %s открыт (%d%s)." -#: ../src/document.c:1360 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", только чтение" -#: ../src/document.c:1565 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Ошибка смены имени файла." -#: ../src/document.c:1640 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -688,7 +715,7 @@ "Произошла ошибка при переводе файла из UTF-8 в \"%s\". Файл остается не " "сохраненным." -#: ../src/document.c:1662 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -697,41 +724,41 @@ "Текст ошибки: %s\n" "Ошибка возникла в \"%s\" (строка: %d, столбец: %d)." -#: ../src/document.c:1667 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Текст ошибки: %s." -#: ../src/document.c:1767 ../src/document.c:1827 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Ошибка записи файла." -#: ../src/document.c:1826 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Ошибка записи файла (%s)." -#: ../src/document.c:1851 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Файл %s сохранен." -#: ../src/document.c:1917 ../src/document.c:1974 ../src/document.c:1982 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "Невозможно найти \"%s\"." -#: ../src/document.c:1982 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Перейти в начало и возобновить поиск?" -#: ../src/document.c:2061 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Совпадений для \"%s\" не найдено." -#: ../src/document.c:2072 ../src/document.c:2081 +#: ../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\"." @@ -739,11 +766,11 @@ msgstr[1] "%s: %d замен(а,ы) для \"%s\" на \"%s\"." msgstr[2] "%s: %d замен(а,ы) для \"%s\" на \"%s\"." -#: ../src/document.c:2903 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Вы действительно хотите обновить его?" -#: ../src/document.c:2904 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -752,32 +779,20 @@ "Файл \"%s\" на диске более новый,\n" "чем в текущем буфере." -#: ../src/document.c:2925 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Попытаться сохранить файл заново?" -#: ../src/document.c:2926 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Файл \"%s\" не был найден на диске!" -#: ../src/editor.c:3859 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3860 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Мac (CR)" - -#: ../src/editor.c:3861 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3985 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Ширина табуляции:" -#: ../src/editor.c:3986 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Количество пробелов, которые будут заменены символом табуляции." @@ -878,133 +893,122 @@ msgstr "Китайская традиционная" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Японская" -#: ../src/encodings.c:141 ../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 "Корейская" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Без кодировки" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Западноевропейская" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Восточноевропейская" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Восточноазиатская" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "Юговосточная и Югозападная _Азия" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Средневосточная" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Юникод" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Пустой" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Файл %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "файл %s" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Пустой" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Файл шелл-скрипта" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Файл Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Документ XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Файл каскадной таблицы стилей (CSS)" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "Данные разгрузки SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Файл diff с различиями" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Файл настроек" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Файл перевода (Gettext)" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "Файл скрипта %s" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Файл reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Языки _программирования" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "_Скриптовые языки" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Языки _разметки" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Прочие _языки" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Все исходные" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Все типы" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Плохое регулярное выражение для типа файлов %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "Без имени" @@ -1018,8 +1022,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "невидимый" @@ -1027,7 +1031,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "_Открыть выбранный файл" @@ -1047,11 +1051,11 @@ msgid "Page Set_up" msgstr "_Настройка принтера" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Закрыть ост_альные" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "_Закрыть все" @@ -1059,83 +1063,79 @@ msgid "_Edit" msgstr "_Правка" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "_Выделить всё" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Форматирование" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Переключить _регистр выделенного текста" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Комментирование строк" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "_Раскомментирование строк" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Переключить _комментирование строк" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "_Дублировать строку или выделенное" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "У_величить отступ" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "У_меньшить отступ" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "_Отправить выделенное в терминал" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "О_тправить выделенное в" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Вставить _комментарии" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "_Вставить описание изменений" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Вставить _заголовок файла" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Вставить _описание функции" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Вставить _многострочный комментарий" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Вставить уведомление _GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Вставить уведомление _BSD" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Вставить _дату" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Вставить \"include <...>\"" @@ -1159,7 +1159,7 @@ msgid "Find in F_iles" msgstr "Найти в _файлах" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Заменить" @@ -1179,7 +1179,7 @@ msgid "Pr_evious Message" msgstr "Предыдущее сообщение" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "_Перейти на строку" @@ -1207,7 +1207,7 @@ msgid "Show Side_bar" msgstr "Показывать _боковую панель" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Редактор" @@ -1251,15 +1251,15 @@ msgid "In_dent Type" msgstr "Т_ип отступа" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Табуляция" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Пробелы" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "_Табуляции и пробелы" @@ -1379,7 +1379,7 @@ msgid "_Debug Messages" msgstr "Сообщения _отладки" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Теги" @@ -1403,72 +1403,75 @@ msgid "Scribble" msgstr "Заметки" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Иконки _и текст" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Только и_конки" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Только _текст" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "_Большие иконки" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "_Маленькие иконки" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "_Очень маленькие иконки" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" -msgstr "_Спрятать панель инструментов" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "_Настроить панель инструментов" + +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" +msgstr "_Скрыть панель инструментов" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "_Найти использование" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "_Статистика документа" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Перейти к _определению тега" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Перейти к _объявлению тега" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "_Контекстное действие" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Настройки" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Загрузить файлы из последней сессии" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Открывать файлы из последнего сеанса работы при загрузке программы" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Загружать виртуальный терминал" -# -- -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1476,39 +1479,39 @@ "Включить эмуляцию виртуального терминала, при запуске программы будет " "загружена VTE-библиотека .Отключите, если вам это не требуется." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Включить поддержку плагинов" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Запуск" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Сохранять позицию и размеры окна" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "Сохранять позицию и размеры окна, и восстанавливать их при запуске" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Подтверждение выхода" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "При закрытии, показывать диалог подтверждения выхода." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Завершение работы" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Рабочий каталог при запуске:" -#: ../src/interface.c:2758 +#: ../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." @@ -1516,19 +1519,19 @@ "Начальный каталог для открытия и сохранения файлов. Путь должен быть " "абсолютным. Оставьте пустым, чтобы использовать текущий рабочий каталог." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Файлы проекта:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Начальный каталог для открытия файлов проекта" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Дополнительный путь для плагинов:" -#: ../src/interface.c:2808 +#: ../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 " @@ -1538,19 +1541,19 @@ "пути указанному здесь будет осуществлен дополнительный поиск для плагинов. " "Оставьте пустым, чтобы отключить." -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Пути" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Запуск" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Сигнал при ошибках или по окончании сборки" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" @@ -1558,11 +1561,11 @@ "Подавать ли звуковой сигнал при возникновении ошибки и при окончании " "компиляции." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Перейти к дежурным сообщениям при новых сообщениях" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1570,11 +1573,11 @@ "Переключать на закладку \"Статус\" (в служебной области снизу), если " "получено новое сообщение состояния." -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Подавлять вывод дежурных сообщений в строке состояния" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1582,11 +1585,11 @@ "Удалить все сообщения из строки состояния. Сообщения по-прежнему " "отображаются в окне сообщений о состоянии." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Авто-фокус для виджетов (фокус следует за мышью)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1596,16 +1599,16 @@ "главного окна редактора, заметок, поиска на панели инструментов, полей " "перехода к строке и терминала." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Разное" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Всегда начинать поиск с начала и скрывать диалоговое окно поиска" # Всегда переходить в начало документа и прятать диалоговое окно поиска после нажатия \"Найти следующее/предыдущее\". -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1613,11 +1616,11 @@ "Всегда осуществлять поиск с начала документа и скрыть в диалоговом окне " "поиска после нажатия \"Найти следующее/предыдущее\"." -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "Использовать слово под курсором для диалогов поиска" -#: ../src/interface.c:2896 +#: ../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" @@ -1625,30 +1628,30 @@ "Использовать слово, находящееся под курсором, при открытии диалогов \"Найти" "\", \"Найти в файлах\" или \"Заменить\", если нет выделенного фрагмента." -#: ../src/interface.c:2898 +#: ../src/interface.c:2918 msgid "Use the current file's directory for Find in Files" msgstr "Использовать каталог текущего файла для \"Найти в файлах\"" -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Поиск" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Использовать файлы сессий для проектов" -#: ../src/interface.c:2924 +#: ../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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Хранить файл проекта внутри основного каталог проекта" -#: ../src/interface.c:2929 +#: ../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 " @@ -1660,76 +1663,75 @@ "Вы все равно можете изменить путь к проектному файлу в диалоге \"Новый проект" "\" (\"Проект\"->\"Новый\")." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Проекты" -# ? -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Прочее" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Общее" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Отображать список тегов" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Включить отображение списка тегов" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Показывать список документов" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Включить/выключить отображение списка документов" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Боковая панель" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Список тегов:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Окно сообщенийи:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Редактор:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Установить шрифт для окна сообщений" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Установить шрифт для списка тегов" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Установить шрифт для редактора текста" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Шрифты" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Показывать вкладки редактора текста" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Показывать кнопки закрытия" -#: ../src/interface.c:3064 +#: ../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)" @@ -1738,107 +1740,111 @@ "файлов, чтобы можно было легко закрывать их одним щелчком (нужен перезапуск " "программы)." -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Расположение новых вкладок:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Слева" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "Новые закладки будут располагаться слева от блокнота" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Справа" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "Новые закладки будут располагаться справа от блокнота" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Двойной-клик скрывает все дополнительные окна." -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Вызывает команду Вид->Показать/Скрыть все панели" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Вкладки редактора текста" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Вверху" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Внизу" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Боковая панель:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Положение вкладок" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Показывать строку состояния" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 msgid "Whether to show the status bar at the bottom of the main window" msgstr "Установить, показывать ли строку состояния внизу главного окна." -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Интерфейс" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Показывать панель _инструментов" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "_Добавить панель инструментов в меню" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" "Поместить панель инструментов в основное меню, для увеличения вертикального " "пространства" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Панель инструментов" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Стиль иконок:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Размер иконок:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Внешний вид" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "Настроить панель инструментов" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Панель инструментов" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Перенос строк" -#: ../src/interface.c:3349 +#: ../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 " @@ -1849,11 +1855,11 @@ "при работе с большими документами, поэтому на слабых машинах следует его " "отключать." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Использовать \"умную\" клавишу \"Home\"." -#: ../src/interface.c:3354 +#: ../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 " @@ -1866,11 +1872,11 @@ "находится там, то он переместится к самому началу строки. Без этой функции " "клавиша Home всегда переносит курсор в самое начало строки." -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Отключить Drag&Drop" -#: ../src/interface.c:3359 +#: ../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" @@ -1878,19 +1884,19 @@ "Отключить Drag&Drop в окне редактора, перетаскивание выделенного в окно и из " "окна редактора станет невозможным." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Включить сворачивание блоков кода" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Включить сворачивание блоков кода" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Сворачивать/разворачивать все вложенные элементы" -#: ../src/interface.c:3369 +#: ../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." @@ -1898,11 +1904,11 @@ "Сворачивать или разворачивать все вложенные элементы. При нажатой клавише " "Shift поведение будет противоположным." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Использовать индикаторы для показа ошибок при сборке" -#: ../src/interface.c:3374 +#: ../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" @@ -1910,24 +1916,23 @@ "Использовать ли индикаторы(волнистое подчеркивание) для выделения строк, где " "компилятор обнаружил предупреждение или ошибку." -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Новая строка убирает лишние пробелы" -# -- -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "Убирать пробелы в конце строки при переходе на новую строку." -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Обрезать текст по столбцу:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Маркер переключения комментариев:" -#: ../src/interface.c:3406 +#: ../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." @@ -1936,96 +1941,95 @@ "режима комментирования строк, она используется для пометки комментариев как " "переключатель." -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Особые функции" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Возможности" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Тип авто-отступа:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Базовый" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Текущие символы" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Совмещать скобки" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Тип:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Ширина:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "Ширина в символах для отображения одного отступа" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Использовать пробелы при отступе" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Использовать один символ табуляции при отступе" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" "Использовать пробелы, если общий отступ меньше ширины символа табуляции, в " "противном случае использовать пробелы и табуляции" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" -msgstr "Ширина табудяции:" +msgstr "Ширина табуляции:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Определять ли тип отступов по содержимому открываемого файла." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Отступ при помощи клавиши Tab" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" "Нажатие tab/shift-tab увеличивает/уменьшает отступ вместо того, чтобы " "вставить символ табуляции" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Отступы" -# ? -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Отступы" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Авто-завершение фрагментов кода" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2033,20 +2037,20 @@ "Введите определенную короткую последовательность символов и дополните её до " "более сложной строки одним нажатием клавиши." -#: ../src/interface.c:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" msgstr "Авто-завершение XML тегов" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Авто-завершение и закрытие открытых XML тегов (включая HTML теги)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Автоматическое продолжение многострочных комментариев" # криво звучит :( -#: ../src/interface.c:3591 +#: ../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" @@ -2054,11 +2058,11 @@ "Автоматически продолжать многострочные комментарии, в таких языках, как C, C+" "+ и Java, когда новая строка введена в таком комментарии." -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" msgstr "Авто-завершение имён" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2066,92 +2070,101 @@ "Автоматическое завершение известных имен объектов в открытых файлах (имена " "функций, глобальные переменные и т.д.)" -#: ../src/interface.c:3604 +#: ../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 "Макс. количество предложений для имени тега:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Количество строк в списке завершения:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" msgstr "Количество символов, необходимых для авто-завершения:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" "Количество символов, которые необходимо ввести, чтобы было показан список " "вариантов для авто-завершения." -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" msgstr "Количество строк, отображаемых в списке авто-завершения." -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +msgid "Maximum number of entries to display in the autocompletion list" msgstr "" "Максимальное количество предлагаемых вариантов в списке авто-завершения." -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Авто-завершение" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Скобки ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Авто-завершение скобки при вводе открывающей" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Одинарные кавычки ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "Авто-завершение одинарных кавычек при вводе открывающей" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Фигурные скобки { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "Авто-завершение фигурных скобок при вводе открывающей" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Угловые скобки [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "Авто-завершение квадратных скобок при вводе открывающей" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Двойные кавычки \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "Авто-завершение двойных кавычек при вводе открывающей" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Авто-завершение кавычек и скобок" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Завершение" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Обратить цвета подсветки синтаксиса" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2159,45 +2172,45 @@ "Использовать белый текст на черном фоне и инвертировать все цвета, " "потребуется перезапуск Geany" -#: ../src/interface.c:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Показывать индикаторы отступа" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Показывать пунктирные линии, это поможет вам в выборе правильного отступа " "справа." -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Показывать чистые пробелы" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Помечать пробелы точками, а табуляции стрелками." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Показывать окончания строк" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Отображать символы окончания строк." -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Показывать _номера строк" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Включить или выключить отображение номеров строк в редакторе" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Отступ для _маркера строк" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2205,38 +2218,38 @@ "Показывает или прячет отступ для маркера, справа от номеров строк. Маркером " "можно отмечать определенные строки." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Остановить прокрутку на последней строке" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" "Останавливает прокрутку на последней строке, если не выбрано то на последней " "странице." -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Отображение" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Маркер длинной строки:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Цвет маркера длинной строки:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Установить цвет маркера длинной строки" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Выбор цвета" -#: ../src/interface.c:3826 +#: ../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 " @@ -2247,11 +2260,11 @@ "строку. Установите число, большее нуля, для указания номера столбца, где " "следует отображать этот маркер." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Строка" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2259,11 +2272,11 @@ "Отображать вертикальную линию в окне редактора на заданной позиции (см. " "ниже)." -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Фон" -#: ../src/interface.c:3846 +#: ../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 " @@ -2273,57 +2286,56 @@ "который установлен ниже (рекомендуется, если вы используете пропорциональные " "шрифты)." -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Отключено" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Маркер длинной строки" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Отображение" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Открывать новые документы из командной строки" -# -- -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "Открывать новые документы из командной строки если файл существует" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Символы конца строки по умолчанию:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Новые файлы" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 msgid "Sets the default encoding for newly created files" msgstr "Устанавливает кодировку по умолчанию, для вновь создаваемых файлов." -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Кодировка по умолчанию (для новых файлов):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Кодировка по умолчанию (существующие файлы):" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 msgid "Sets the default encoding for opening existing files" msgstr "" "Устанавливает кодировку по умолчанию, при открытии существующих файлов." -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Использовать одну и ту же кодировку для открытия файлов" -#: ../src/interface.c:3978 +#: ../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 " @@ -2333,51 +2345,51 @@ "файлы будут открывается в указанной кодировке (обычно в этом нет " "необходимости)." -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Кодировка:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Следить за наличием новой строки в конце файла" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 msgid "Ensures that at the end of the file is a new line" msgstr "Следить за тем, что в конце файла находится новая строка" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Убирать лишние пробелы и табуляции" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Убирать лишние пробелы, табуляции и окончания строк" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Заменить табуляции пробелами" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "Все табуляции, в документе, заменить пробелами." -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Сохранение файлов" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Длина списка недавних файлов:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Количество файлов, сохраняемых в списке недавно открытых файлов." -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Таймаут проверки диска:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2385,27 +2397,27 @@ "Периодичность проверки на изменение файлов на диске (в секундах). Нулевое " "значение отключает проверку." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1019 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Файлы" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Терминал:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Браузер:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Путь и опции для make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2413,24 +2425,24 @@ "Эмулятор терминала,например: xterm, gnome-terminal или konsole (должен " "принимать аргумент -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Путь (и, возможно, дополнительные аргументы) к вашему любимому браузеру" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Пути утилит" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Контекстное действие:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2441,67 +2453,67 @@ "подставлять с помощью %s. Его можно вставлять в любом месте указанной " "команды и подстановка будет выполнена до её выполнения." -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Команды" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Сервис" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "адрес электронной почты разработчика" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Инициалы имени разработчика" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Стартовая версия:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Номер версии, которую изначально имеет новый файл" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Имя компании:" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Разработчик:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Компания:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Адрес электронной почты:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Инициалы:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Имя разработчика:" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Год:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Дата:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Дата и время:" -#: ../src/interface.c:4382 +#: ../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." @@ -2509,7 +2521,7 @@ "Укажите формат для группового символа {datetime}. Можно использовать любые " "параметры, которые годятся для функции strftime ANSI C." -#: ../src/interface.c:4389 +#: ../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." @@ -2517,7 +2529,7 @@ "Укажите формат для группового символа {year}. Можно использовать любые " "параметры, которые годятся для функции strftime ANSI C." -#: ../src/interface.c:4396 +#: ../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." @@ -2525,64 +2537,64 @@ "Укажите формат для группового символа {date}. Можно использовать любые " "параметры, которые годятся для функции strftime ANSI C." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Данные шаблонов" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Шаблоны" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "_Изменить" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Сочетания клавиш" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Привязки" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Команда:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" "Путь к команде для вывода файла на печать (используйте %f для имени файла)" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Использовать внешнюю команду для печати" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Показывать номера строк" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Добавлять номера строк на печатаемой странице" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Печатать номера страниц" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "" "Добавлять номера страниц на каждую страницу, это займёт 2 строки внизу " "страницы." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Печатать заголовок страницы" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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." @@ -2590,19 +2602,19 @@ "Добавлять небольшой заголовок в начало каждой страницы с указанием номера " "страницы, имени файла и текущей даты (см. ниже). Это занимает 3 строки." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Использовать только имя текущего файла" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" msgstr "Печатать только имя файла, опуская путь к нему." -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Формат даты:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2612,537 +2624,554 @@ "страницы. Можно использовать любые параметры, которые годятся для функции " "strftime ANSI C." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Использовать собственный механизм печати GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Печать" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Свойства проекта" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Файл" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Новый" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Открыть" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Открыть выбранный файл" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Сохранить" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Сохранить как" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Сохранить все" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Печать" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Закрыть" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Закрыть все" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Обновить файл" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Проект" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Свойства проекта" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Отменить" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Повторить" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Дублировать строку или выделенное" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Удалить текущую строку (строки)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +msgid "Delete to line end" +msgstr "Удалить до конца строки" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "Переместить текущую строку" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Прокрутить до текущей строки" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Прокрутить наверх на одну строку" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Прокрутить вниз на одну строку" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Полный фрагмент кода" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Перемещать курсор в фрагменте" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Подавлять авто-завершение фрагментов кода" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Контекстное действие" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Полное слово" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Показывать подсказки" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Показывать список макросов" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Буфер обмена" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Вырезать" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Копировать" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Вставить" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Копировать текущую строку (строки)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Вырезать текущую строку (строки)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Выбрать" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Выбрать все" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Выбрать текущее слово" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Выбрать текущую строку (строки)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Выбрать текущий абзац" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Формат" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Переключить регистр в выделении" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Переключить комментирование строк" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Комментировать строку (строки)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Разкомментировать строку (строки)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Увеличить отступ" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Уменьшить отступ" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Увеличить отступ на один пробел" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Уменьшить отступ на один пробел" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "\"Умный\" отступ строк" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Передать пользовательской команде 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Передать пользовательской команде 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Передать пользовательской команде 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Отправить выделенное в терминал" -#: ../src/keybindings.c:319 +# -- может быть передвинуть или отразить ? +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "переформатировать строку/блок" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Вставить" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Вставить дату" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Вставить переменный пробел" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Настройки" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Поиск" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Найти" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Найти следующее" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Найти предыдущее" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Найти следующее выделение" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Найти предыдущее выделенное" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Заменить" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Найти в файлах" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Следующее сообщение" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Предыдущее сообщение" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Найти использование" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Статистика документа" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "Выделить все" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Перейти" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Вернуться на шаг назад" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Перейти на шаг вперёд" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Перейти к парной скобке" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Переключить маркер" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Перейти к следующему маркеру" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Перейти к предыдущему маркеру" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Перейти к определению тега" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Перейти к объявлению тега" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Перейти к началу строки" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Перейти к концу строки" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "К концу текущей строки" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Перейти к предыдущему маркеру" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Перейти к следующему маркеру" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Вид" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Переключить все дополнительные виджеты" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Во весь экран" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Показывать окно сообщений" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Показывать боковую панель" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Увеличить" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Уменьшить" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Фокус" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Перейти к редактору" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Перейти к заметкам" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Переключиться в терминал" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Перейти к поиску" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Перейти к боковой панели" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Переключиться на компилятор" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Вкладка блокнота" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Перейти на документ слева" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Перейти на документ справа" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Перейти на последний документ" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Переместить документ влево" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Переместить документ вправо" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Переместить документ в начало" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Переместить документ в конец" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Документ" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Переключить режим переноса строк" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Переключить перенос строк" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Заменить пробелы табуляциями" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Свернуть/развернуть текущий блок" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Свернуть все" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Развернуть все" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Обновить список тегов" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Сборка" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Скомпилировать" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Сборка всего" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Сборка цели пользователя" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Сборка объекта" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Следующая ошибка" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Предыдущая ошибка" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Запустить" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Запустить (другая команда)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Опции сборки" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Показывать выбор цвета" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Справка" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Сочетания клавиш" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Следующие сочетания клавиш можно настроить:" # Перейти на документ слева -#: ../src/keybindings.c:1531 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Перейти к документу" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Здесь можно писать что угодно, используйте это для заметок и быстрых записей" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Не удалось загрузить один или несколько файлов сессии." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Сообщения отладки" @@ -3158,7 +3187,6 @@ msgid "Use an alternate configuration directory" msgstr "использовать другой каталог настроек" -# Быть многословным #: ../src/main.c:126 ../src/main.c:146 msgid "Be verbose" msgstr "Подробно." @@ -3202,7 +3230,7 @@ msgstr "Вывести инсталляционный префикс Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "Не загружать файлы предыдущей сессии" #: ../src/main.c:143 @@ -3217,25 +3245,25 @@ msgid "Show version and exit" msgstr "Показать версию программы и выйти" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[ФАЙЛЫ...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Переместить это?" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" "Перед запуском Geany необходимо переместить ваш старый каталог с настройками." -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3244,7 +3272,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3253,7 +3281,7 @@ "Ваш каталог с настройками \"%s\" не может быть перемещен в \"%s\" (%s). " "Пожалуйста, переместите каталог с настройками в ручную." -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3265,22 +3293,22 @@ "настроек.\n" "Запустить Geany в любом случае?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "Не могу найти файл \"%s\"." -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Это Geany %s" -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Каталог настроек не может быть создан (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Файлы настроек обновлены." @@ -3296,7 +3324,7 @@ msgid "_Hide Message Window" msgstr "_Скрыть окно сообщений" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3305,11 +3333,11 @@ "Плагин \"%s\" не совместим с этой версией программы Geany - пожалуйста, " "скомпилируйте его заново." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Менеджер _плагинов" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3320,23 +3348,23 @@ "Описание: %s\n" "Автор(ы): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Активный" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Плагин" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Нет доступных плагинов" -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Плагины" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3344,48 +3372,56 @@ "Внизу находится список доступных плагинов. Выберите те из них, которые вы " "хотите загружать при запуске Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Подробнее о плагине:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Действие" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Сокращение" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Захватить клавишу" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Нажмите сочетание клавиш, которые вы хотите использовать для \"%s\"" -#: ../src/prefs.c:1333 +#: ../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 "Действие" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Сокращение" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Переопределить" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Переопределить это сочетание?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Комбинация клавиш \"%s\" уже используется для \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "Введите пути к утилитам. Для ненужных утилит пути можно не указывать." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3393,7 +3429,7 @@ "Введите информацию для использования в шаблонах.\n" "Смотрите документацию для изучения работы с шаблонами." -#: ../src/prefs.c:1458 +#: ../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." @@ -3404,7 +3440,7 @@ "настройки." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3416,7 +3452,7 @@ "вы можете редактировать строку сочетания напрямую." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3425,18 +3461,8 @@ "если Geany была собрана и запущена с использованием GTK версии 2.10 и " "старше." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"Примечание: Чтобы настроить панель элементов, редактируйте файл " -"'ui_toolbar.xml'. Пожалуйста, смотрите в документации для получения более " -"подробной информации." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3444,47 +3470,54 @@ "Внимание: Для определения настроек в текущем проекте. Смотреть Проект-" ">Свойства." -#: ../src/printing.c:270 +#: ../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 "Страница %d из %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Параметры документа" -#: ../src/printing.c:375 +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" msgstr "Печатать только имя файла, опуская путь к нему." -# ? -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Страница %d из %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Печать файла \"%s\" была отменена" -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Файл %s распечатан." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Печать \"%s\" завершилась с ошибкой (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." msgstr "" "Пожалуйста, сначала укажите команду для печати, в соответствующем диалоге " "настроек." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3495,7 +3528,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Печать \"%s\" завершилась с ошибкой (код ошибки: %s)." @@ -3514,19 +3547,19 @@ msgid "C_reate" msgstr "С_оздать" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Имя:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Имя файла:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Путь к каталогу:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3536,41 +3569,41 @@ "новый каталог, так и уже существующий. Вы можете использовать относительные " "пути (относительно имени проекта)." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Выберите путь к каталогу проекта:" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Файл проекта \"%s\" не может быть загружен." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Открыть проект" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Файлы проекта" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Проект \"%s\" закрыт." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Описание:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Скомпилировать в каталоге проекта" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Команда запуска:" -#: ../src/project.c:457 +#: ../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." @@ -3578,81 +3611,81 @@ "Командная строка для выполнения внутри каталога проекта. К команде можно " "добавлять опции. Оставьте пустым для использования команды по умолчанию." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Шаблоны файлов:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Хотите закрыть его до продолжения действия?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Проект \"%s\" уже открыт" -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Указанное имя проекта слишком короткое" -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Указанное имя проекта слишком длинное (максимум %d символов)." -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Было задано недопустимое имя проекта." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Создать каталог проекта?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Путь \"%s\" не существует." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Каталог для проекта не может быть создан (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Невозможна запись в файл проекта (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Проект \"%s\" создан." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Проект %s сохранен." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Выберите имя проекта" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Выберите команду запсука проекта" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Проект \"%s\" открыт." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Использовать _регулярные выражения" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3660,15 +3693,15 @@ "Использовать регулярные выражения POSIX. Для более подробной информации по " "использованию регулярных выражений см. соответствующую документацию." -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Обратный _поиск" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "_Использовать escape-последовательности" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3676,127 +3709,127 @@ "Заменять \\\\, \\t, \\n, \\r и \\uXXXX (символы Unicode) соответствующими " "управляющими символами." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "С _учетом регистра" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Совпадение только _всего слова" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Совпадение с _начала слова" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Предыдущее" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Следующее" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../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:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Найти все" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Пометить" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Выделить все совпадения в текущем документе." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "В с_ессии" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "В _документе" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Закрыть _диалог" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Отключите эту опцию, чтобы сохранить диалог открытым" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Найти _и заменить" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Заменить _на:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "З_аменить все" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "В в_ыделенном" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Заменить все совпадения с фразой в конкретном выделенном тексте" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Каталог:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "_Кодировка:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "_Фиксированные строки" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Регулярные выражения для Grep" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "См. справку grep для более подробной информации." -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Расширенные регулярные выражения" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "_Рекурсивно в подкаталогах" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Инвертировать результаты поиска" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" "Инвертировать смысл соответствия, для выбора не совпадающих с шаблоном строк." -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Дополнительные _опции:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Прочие параметры для передачи утилите grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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\"." @@ -3804,7 +3837,7 @@ msgstr[1] "Найдено %d совпадения для \"%s\"." msgstr[2] "Найдено %d совпадений для \"%s\"." -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, c-format msgid "Replaced text in %u file." msgid_plural "Replaced text in %u files." @@ -3812,41 +3845,40 @@ msgstr[1] "Текст заменён в файле(файлах) %u ." msgstr[2] "Текст заменён в файле(файлах) %u ." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Для поиска в файлах указан недопустимый каталог." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Нет текста для поиска." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Не могу выполнить утилиту grep \"%s\"; проверьте путь, заданный в настройках." -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Поиск..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (в каталоге: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Не могу открыть каталог (%s)" -# Поиск ошибок (для подробностей смотреть Справка->Сообщения отладки). -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" "Ошибка поиска(для подробностей смотреть Справка->Сообщения отладки)." -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." @@ -3854,225 +3886,233 @@ msgstr[1] "Поиск завершен, найдено %d совпадение." msgstr[2] "Поиск завершен, найдено %d совпадение." -#: ../src/search.c:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Совпадений нет." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Глава" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Раздел" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Секция1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Секция2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Секция3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Дополнение" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Модуль" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../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:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Конструкторы типов" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Разделы" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Команда" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Окружение" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Подраздел" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Субподраздел" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Метка" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Структуры" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Пакет" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "My" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Local" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Our" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Константы" # rem Гиперссылка -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Якоря" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Заголовок (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Заголовок (H2)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Заголовок (H3)" # CSS -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "Идентификаторы" # CSS -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Типы" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Модули" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Синглтоны" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Пространства имен" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Процедуры" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "Импорт" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Члены" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Метки" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Подпрограммы" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Блоки" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Макросы" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Определения" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Цели" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Пространства имен" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Структуры" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Типы / Перечисления" -#: ../src/symbols.c:1311 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Неизвестное расширение имени файла для \"%s\".\n" -#: ../src/symbols.c:1332 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Не удалось создать файл тегов, возможно, тегов найдено не было.\n" -#: ../src/symbols.c:1339 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4081,7 +4121,7 @@ "Использование: %s -g <Файл Тегов> <Список Файлов>\n" "\n" -#: ../src/symbols.c:1340 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4092,168 +4132,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:1354 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Загрузить теги" -#: ../src/symbols.c:1361 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Файл тегов Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1381 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Загружено %s файлов с тегами \"%s\"." -#: ../src/symbols.c:1383 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Невозможно загрузить файл тегов \"%s\"." -#: ../src/symbols.c:1517 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Предварительное объявление \"%s\" не найдено." -#: ../src/symbols.c:1519 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Определение \"%s\" не найдено." -#: ../src/symbols.c:1810 -msgid "_Expand All" -msgstr "_Развернуть все" - -#: ../src/symbols.c:1815 -msgid "_Collapse All" -msgstr "_Свернуть все" - -#: ../src/symbols.c:1825 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Сортировать по _имени" -#: ../src/symbols.c:1832 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Сортировать по _появлению" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Сохранить текущий файл" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Сохранить _все" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Сохранить все открытые файлы" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Обновить текущий файл с диска" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Закрыть текущий файл" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Закрыть все открытые файлы" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Вырезать выделенное" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Скопировать выделенное" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Вставить содержимое буфера обмена" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Удалить выделенное" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Отменить последнее изменение" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Повторить последнее изменение" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Скомпилировать текущий файл" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Запустить или посмотреть текущий файл" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Открыть диалог выбора цвета, позволяющий выбирать цвет из палитры." -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Увеличить текст" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Уменьшить текст" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Уменьшить отступ" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Увеличить отступ" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Найти введенный текст в текущем файле" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Перейти на введенный номер строки" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Показать диалог настроек" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Выйти из Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Печать документа" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" -"Для вступление в силу сделанных изменений необходимо перезапустить Geany" +#: ../src/toolbar.c:80 +msgid "Replace text in the current document" +msgstr "Замена текста в текущем документе" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Создать _новый файл" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Открыть существующий файл" -#: ../src/toolbar.c:208 +#: ../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 +msgid "Displayed Items" +msgstr "Отображаемые элементы" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4321,123 +4371,143 @@ msgid "Characters:" msgstr "Символов:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Тегов нет." -#: ../src/treeviews.c:491 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Показать список _тегов" -#: ../src/treeviews.c:499 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Показать список _документов" -#: ../src/treeviews.c:507 ../plugins/filebrowser.c:586 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "_Скрыть боковую панель" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "Показать _пути" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "строка: %d\t столбец: %d\t выд.: %d\t" #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "ТЧ" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "ПРЗ" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "ВСТ" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "ТАБ" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "ПРБ" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "ТАБ/ПРБ" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "режим: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "Кодировка: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "тип файла: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "МОД" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "область видимости: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Шрифт обновлен (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Стандартная библиотека C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Стандартная библиотека C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Cтандартная библиотека C++" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "С++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "_Установить формат даты" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Выбрать каталог" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Выбрать файл" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Файлы _настроек." -#: ../src/ui_utils.c:1756 +#: ../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 "Мac (CR)" + +#: ../src/utils.c:326 +msgid "Unix (LF)" +msgstr "Unix (LF)" + #: ../src/vte.c:301 ../src/vte.c:726 msgid "Terminal" msgstr "Терминал" @@ -4565,7 +4635,7 @@ "Эта опция отключает горячую клавишу для вызова меню (обычно F10). Это может " "пригодиться, например, если вы используете MC в окне терминала." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1125 +#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 msgid "Follow the path of the current file" msgstr "Следовать пути текущего файла" @@ -4600,161 +4670,145 @@ "Запускать программы в VTE, вместо того, чтобы открывать отдельное окно с " "терминалом. Внимание: программы, выполняемые в VTE, нельзя остановить." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Файлы проекта Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Выполняемые" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Ошибка" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Вопрос" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Предупреждение" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Информация" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Генератор классов" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Создает файлы исходного кода для новых типов классов." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Создать класс" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Класс" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Имя класса:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Файл заголовка:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Файл исходного кода:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Наследование" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Базовый класс:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Базовый заголовок:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Глобально" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Базовый GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Опции" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Создать конструктор" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Создать деструктор" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Конструктор GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Создать _класс" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "Класс _C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "Класс _GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Символы HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Вставляет символы HTML как \"&\"." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Команда разработчиков Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Символы HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Символы ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Греческие символы" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Математические символы" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Технические символы" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Символы стрелок" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Знаки препинания" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Прочие символы" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Специальные символы" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Вставить" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4763,168 +4817,166 @@ "используйте кнопку для того, чтобы вставить символ на текущую позицию " "курсора." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Символ" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (имя)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Вставить _специальные символы HTML" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "Замены HTML" -#: ../plugins/htmlchars.c:706 -#, fuzzy +# _HTML переключатель ?? +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" -msgstr "_HTML переключатель" +msgstr "_HTML режим" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Полная замена специальных символов" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Вставить специальные символы HTML" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Заменить специальные символы" -# --- -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Переключить статус плагина" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Экспорт" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Экспортировать текущий файл в различные форматы." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Экспортировать файл" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "_Использовать текущий уровень увеличения" -# --- -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" "Устанавливает размер шрифта для отображения документа в соответствии с " "текущим масштабом" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Документ успешно экспортирован как \"%s\"." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Файл \"%s\" недоступен для записи (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' уже существует. Переписать поверху?" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Экспорт" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "В _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "В _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Просмотр файлов" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Добавить просмотр файлов на боковую панель." -#: ../plugins/filebrowser.c:329 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Выбрано слишком много объектов!" -#: ../plugins/filebrowser.c:405 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Невозможно выполнить внешнюю команду \"%s\" (%s)." -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Открыть во _внешней программе" -#: ../plugins/filebrowser.c:567 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Найти в файлах" -#: ../plugins/filebrowser.c:577 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Показать _скрытые файлы" -#: ../plugins/filebrowser.c:769 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Вверх" -#: ../plugins/filebrowser.c:774 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Обновить" -#: ../plugins/filebrowser.c:779 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Домой" -#: ../plugins/filebrowser.c:784 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Установить путь из документа" -#: ../plugins/filebrowser.c:792 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Очистить фильтр" -#: ../plugins/filebrowser.c:806 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Фильтр:" -#: ../plugins/filebrowser.c:1025 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Фокус на список файлов" -#: ../plugins/filebrowser.c:1027 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Фокус на ввод пути" -#: ../plugins/filebrowser.c:1070 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "Каталог настроек плагинов не может быть создан." -#: ../plugins/filebrowser.c:1095 +#: ../plugins/filebrowser.c:1092 msgid "External open command:" msgstr "Внешняя команда для открытия файла:" -#: ../plugins/filebrowser.c:1104 +#: ../plugins/filebrowser.c:1101 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4938,15 +4990,15 @@ "%f будет заменено на имя файла, включая полный путь к нему.\n" "%d будет заменено только на путь, без имени файла." -#: ../plugins/filebrowser.c:1110 +#: ../plugins/filebrowser.c:1107 msgid "Show hidden files" msgstr "Показать скрытые файлы" -#: ../plugins/filebrowser.c:1116 +#: ../plugins/filebrowser.c:1113 msgid "Hide object files" msgstr "Скрыть файлы объектов" -#: ../plugins/filebrowser.c:1120 +#: ../plugins/filebrowser.c:1117 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4954,40 +5006,40 @@ "Не показывать в просмотре файлов сгенерированные объектные файлы (*.o, *." "obj. *.so, *.dll, *.a, *.lib)" -#: ../plugins/filebrowser.c:1131 -msgid "Set the project's base directory" -msgstr "Установить базовый путь проекта" +#: ../plugins/filebrowser.c:1128 +msgid "Use the project's base directory" +msgstr "Использовать базовый путь проекта" -#: ../plugins/filebrowser.c:1135 +#: ../plugins/filebrowser.c:1132 msgid "" "Change the directory to the base directory of the currently opened project" msgstr "Измените путь на базовый путь в уже открытых проектах" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Сохранить действия" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "Данный плагин предлагает различные действия для сохранения файлов." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Резервная копия: Каталог не может быть создан (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Резервная копия: Файл \"%s\" недоступен для чтения." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Резервная копия: Файл \"%s\" недоступен для записи." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4996,104 +5048,134 @@ msgstr[2] "Автоматическое сохранение: Сохранено %d файл(а, ов)." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Выбрать каталог" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Каталог для резервных копий не существует или нет прав записи." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Автоматическое сохранение" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Включить" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Интервал автоматического сохранения:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "секунд" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "_Выводить дежурное сообщение при автоматическом сохранении файлов" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Сохранить только текущий открытый _файл" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Со_хранить все открытые файлы" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Мгновенное сохранение" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "_Тип файла по умолчанию для создаваемых файлов:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Резервная копия" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "_Каталог для сохранения резервных копий:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" "Формат даты и времени для резервных копий (см. сведения в \"man strftime\"):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Уровень _вложения каталогов для резервных копий:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Разделить окно" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Разделяет окно редактирования на два отдельных окна." -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Показать текущий документ" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Отменить разделение" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "_Разделить окно" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Горизонтально" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Вертикально" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Разделить по горизонтали" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Разделить по вертикали" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "Отменить разделение" +#~ msgid "Diff file" +#~ msgstr "Файл diff с различиями" + +#~ msgid "reStructuredText file" +#~ msgstr "Файл reStructuredText" + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "Для вступление в силу сделанных изменений необходимо перезапустить Geany" + +#~ 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 "Failed to view %s (make sure it is already compiled)" #~ msgstr "Ошибка при просмотре %s (убедитесь что файл уже скомпилирован)" @@ -5389,9 +5471,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Структуры (Structs) / Определения (Typedefs)" -#~ msgid "Show _Full Path Name" -#~ msgstr "Показать _полный путь" - #~ msgid "Terminal emulation:" #~ msgstr "Эмуляция терминала:" @@ -5602,10 +5681,6 @@ #~ msgid "Complete construct" #~ msgstr "Полное слово" -#, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "Авто-завершение конструкций" - #~ msgid "Go to tag definition" #~ msgstr "Перейти к определению тега" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/sl.po /tmp/ssBwSf4GIv/geany-0.18/po/sl.po --- geany-0.17/po/sl.po 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/po/sl.po 2009-08-16 17:18:28.000000000 +0100 @@ -0,0 +1,5165 @@ +# 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. +# +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 23:24+0100\n" +"Last-Translator: Jože Klepec \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" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" +"X-Poedit-SourceCharset: utf-8\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 +msgid "Geany" +msgstr "Geany" + +#: ../geany.desktop.in.h:3 +msgid "Integrated Development Environment" +msgstr "Vdelano razvojno okolje" + +#: ../src/about.c:139 +msgid "About Geany" +msgstr "O Geany" + +#: ../src/about.c:189 +msgid "A fast and lightweight IDE" +msgstr "Hitro in lahkotno razvojno okolje" + +#: ../src/about.c:210 +#, 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 +msgid "Info" +msgstr "Info" + +#: ../src/about.c:257 +msgid "Developers" +msgstr "Razvijalci" + +#: ../src/about.c:266 +msgid "maintainer" +msgstr "vzdrževalec" + +#: ../src/about.c:274 +msgid "developer" +msgstr "razvijalec" + +#: ../src/about.c:282 +msgid "translation maintainer" +msgstr "vzdrževalec prevoda" + +#: ../src/about.c:291 +msgid "Translators" +msgstr "Prevajalci" + +#: ../src/about.c:311 +msgid "Previous Translators" +msgstr "Prejšnji prevajalci" + +#: ../src/about.c:332 +msgid "Contributors" +msgstr "Sodelavci" + +#: ../src/about.c:342 +#, 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):" + +#: ../src/about.c:368 +msgid "Credits" +msgstr "Zahvale" + +#: ../src/about.c:382 +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/build.c:236 ../src/build.c:650 +#, 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:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 +#, 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 +#, 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." +msgstr "Izvajanje v VTE ni možno, ker verjetno vsebuje ukaz." + +#: ../src/build.c:914 +msgid "Compilation failed." +msgstr "Prevajanje spodletelo." + +#: ../src/build.c:928 +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" + +# skok na naslednjo napako +#. next error +#: ../src/build.c:1090 ../src/build.c:1187 +msgid "_Next Error" +msgstr "_Naslednja napaka" + +# skok na prejšnjo napako +#: ../src/build.c:1097 ../src/build.c:1194 +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:1892 ../src/toolbar.c:344 +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 +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 +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 +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 +#, 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 +msgid "No more build errors." +msgstr "Ni več napak gradnje." + +#: ../src/callbacks.c:152 +msgid "Do you really want to quit?" +msgstr "Zares želite končati z delom?" + +# ponovno naloži datoteko +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 +msgid "_Reload" +msgstr "_Ponovno odpri" + +#: ../src/callbacks.c:470 +msgid "Any unsaved changes will be lost." +msgstr "Vse neshranjene spremembe bodo izgubljene." + +#: ../src/callbacks.c:471 +#, 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 +msgid "Go to Line" +msgstr "Pojdi na vrstico" + +#: ../src/callbacks.c:1249 +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:1474 ../src/ui_utils.c:542 +msgid "dd.mm.yyyy" +msgstr "dd.mm.yyyy" + +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 +msgid "mm.dd.yyyy" +msgstr "mm.dd.yyyy" + +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 +msgid "yyyy/mm/dd" +msgstr "yyyy/mm/dd" + +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 +msgid "dd.mm.yyyy hh:mm:ss" +msgstr "dd.mm.yyyy hh:mm:ss" + +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 +msgid "mm.dd.yyyy hh:mm:ss" +msgstr "mm.dd.yyyy hh:mm:ss" + +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 +msgid "yyyy/mm/dd hh:mm:ss" +msgstr "yyyy/mm/dd hh:mm:ss" + +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 +msgid "_Use Custom Date Format" +msgstr "_Uporabi obliko datuma po meri" + +#: ../src/callbacks.c:1497 +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:1516 +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 +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 +msgid "Open File" +msgstr "Odpri datoteko" + +#: ../src/dialogs.c:144 ../src/interface.c:691 +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:169 +msgid "Detect by file extension" +msgstr "Zaznaj po podaljšku datoteke" + +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 +msgid "Detect from file" +msgstr "Zaznaj po vsebini" + +#: ../src/dialogs.c:258 +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 +msgid "Show _hidden files" +msgstr "Pokaži _skrite datoteke" + +#: ../src/dialogs.c:276 +msgid "Set encoding:" +msgstr "Nastavi kodiranje:" + +#: ../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 "" +"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 +msgid "Set filetype:" +msgstr "Nastavi tip datoteke:" + +#: ../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 "" +"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" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 +msgid "Save File" +msgstr "Shrani datoteko" + +#: ../src/dialogs.c:432 +msgid "R_ename" +msgstr "_Preimenuj" + +#: ../src/dialogs.c:434 +msgid "Save the file and rename it" +msgstr "Shrani datoteko in jo preimenuje" + +#: ../src/dialogs.c:442 +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:567 ../src/win32.c:562 +msgid "Error" +msgstr "Napaka" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Vprašanje" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Opozorilo" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Informacije" + +#: ../src/dialogs.c:656 +msgid "_Don't save" +msgstr "_Ne shrani" + +#: ../src/dialogs.c:687 +#, c-format +msgid "The file '%s' is not saved." +msgstr "Datoteka '%s' ni bila shranjena." + +#: ../src/dialogs.c:689 +msgid "Do you want to save it before closing?" +msgstr "Ali jo želite shraniti pred zapiranjem?" + +#: ../src/dialogs.c:764 +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 +msgid "unknown" +msgstr "neznano" + +#: ../src/dialogs.c:1039 ../src/symbols.c:780 +msgid "Properties" +msgstr "Lastnosti" + +#: ../src/dialogs.c:1070 +msgid "Type:" +msgstr "Tip:" + +#: ../src/dialogs.c:1084 +msgid "Size:" +msgstr "Velikost:" + +#: ../src/dialogs.c:1100 +msgid "Location:" +msgstr "Location:" + +#: ../src/dialogs.c:1114 +msgid "Read-only:" +msgstr "Samo-za-branje:" + +#: ../src/dialogs.c:1121 +msgid "(only inside Geany)" +msgstr "(samo znotraj Geany)" + +#: ../src/dialogs.c:1130 +msgid "Encoding:" +msgstr "Kodiranje:" + +#. BOM = byte order mark +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 +msgid "(with BOM)" +msgstr "(z BOM)" + +#: ../src/dialogs.c:1140 +msgid "(without BOM)" +msgstr "(brez BOM)" + +# prilagojeno, spremenjeno +#: ../src/dialogs.c:1151 +msgid "Modified:" +msgstr "Prilagojeno:" + +# spremenjeno, prenarejeno +#: ../src/dialogs.c:1165 +msgid "Changed:" +msgstr "Spremenjeno:" + +#: ../src/dialogs.c:1179 +msgid "Accessed:" +msgstr "Dostopano:" + +#: ../src/dialogs.c:1201 +msgid "Permissions:" +msgstr "Dovoljenja:" + +#. Header +#: ../src/dialogs.c:1209 +msgid "Read:" +msgstr "Branje:" + +#: ../src/dialogs.c:1216 +msgid "Write:" +msgstr "Pisanje:" + +# Lastnik +#. Owner +#: ../src/dialogs.c:1231 +msgid "Owner:" +msgstr "Lastnik:" + +#. Group +#: ../src/dialogs.c:1267 +msgid "Group:" +msgstr "Skupina:" + +# Drugi, npr. guest, anonymus, ostali uporabniki +#. Other +#: ../src/dialogs.c:1303 +msgid "Other:" +msgstr "Drugi:" + +#: ../src/document.c:622 +#, c-format +msgid "File %s closed." +msgstr "Datoteka %s zaprta." + +#: ../src/document.c:745 +#, c-format +msgid "New file \"%s\" opened." +msgstr "Odprta nova datoteka \"%s\"." + +#: ../src/document.c:918 ../src/document.c:1421 +#, c-format +msgid "Could not open file %s (%s)" +msgstr "Ni mogoče odpreti datoteke %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 "" +"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 +#, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "Datoteka \"%s\" ni veljavna %s datoteka." + +#: ../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 "" +"Datoteka \"%s\" ni besedilna datoteka ali kodiranje besedila ni podprto." + +#: ../src/document.c:1122 +msgid "Spaces" +msgstr "Presledki" + +#: ../src/document.c:1125 +msgid "Tabs" +msgstr "Razmaki" + +#: ../src/document.c:1128 +msgid "Tabs and Spaces" +msgstr "Razmaki in presledki" + +# For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs +# * 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 +#, c-format +msgid "Setting %s indentation mode for %s." +msgstr "Nastavitev %s načina zamikanja za %s." + +#: ../src/document.c:1186 +msgid "Invalid filename" +msgstr "Napačno ime datoteke" + +#: ../src/document.c:1309 +#, c-format +msgid "File %s reloaded." +msgstr "Datoteka %s ponovno odprta." + +#. 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 "Datoteka %s je odprta (%d%s)." + +#: ../src/document.c:1316 +msgid ", read-only" +msgstr ", za branje" + +#: ../src/document.c:1512 +msgid "Error renaming file." +msgstr "Napaka med preimenovanjem datoteke." + +#: ../src/document.c:1587 +#, 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." + +#: ../src/document.c:1609 +#, c-format +msgid "" +"Error message: %s\n" +"The error occurred at \"%s\" (line: %d, column: %d)." +msgstr "" +"Sporočilo o napaki: %s\n" +"Napaka se je pojavila na mestu \"%s\" (vrstica: %d, stolpec %d)." + +#: ../src/document.c:1614 +#, c-format +msgid "Error message: %s." +msgstr "Sporočilo o napaki: %s." + +#: ../src/document.c:1715 ../src/document.c:1775 +msgid "Error saving file." +msgstr "Napaka med shranjevanjem datoteke." + +#: ../src/document.c:1774 +#, c-format +msgid "Error saving file (%s)." +msgstr "Napaka med shranjevanjem datoteke (%s)." + +#: ../src/document.c:1799 +#, 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 +#, c-format +msgid "\"%s\" was not found." +msgstr "\"%s\" ni bila najden." + +#: ../src/document.c:1932 +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 +#, c-format +msgid "No matches found for \"%s\"." +msgstr "Ni ujemanj za \"%s\"." + +#: ../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: zamenjano %d pojavljanje niza \"%s\" z nizom \"%s\"." +msgstr[1] "%s: zamenjani %d pojavljanji niza \"%s\" z nizom \"%s\"." +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 +msgid "Do you want to reload it?" +msgstr "Ali želite ponovno odpreti datoteko?" + +#: ../src/document.c:2869 +#, c-format +msgid "" +"The file '%s' on the disk is more recent than\n" +"the current buffer." +msgstr "" +"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:2891 +#, c-format +msgid "File \"%s\" was not found on disk!" +msgstr "Datoteka \"%s\" ni bila najdena na disku!" + +#: ../src/editor.c:4288 +msgid "Enter Tab Width" +msgstr "Vnesite širino tabulatorja" + +#: ../src/editor.c:4289 +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/encodings.c:76 +msgid "Celtic" +msgstr "Keltsko" + +#: ../src/encodings.c:77 ../src/encodings.c:78 +msgid "Greek" +msgstr "Grško" + +#: ../src/encodings.c:79 +msgid "Nordic" +msgstr "Nordijsko" + +#: ../src/encodings.c:80 +msgid "South European" +msgstr "Južnoevropsko" + +#: ../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 +msgid "Baltic" +msgstr "Baltsko" + +#: ../src/encodings.c:89 ../src/encodings.c:90 ../src/encodings.c:91 +msgid "Central European" +msgstr "Centralnoevropsko" + +# 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 +msgid "Cyrillic" +msgstr "Cirilsko" + +#: ../src/encodings.c:98 +msgid "Cyrillic/Russian" +msgstr "Cirilsko-rusko" + +#: ../src/encodings.c:99 +msgid "Cyrillic/Ukrainian" +msgstr "Cirilsko-ukrajinsko" + +#: ../src/encodings.c:100 +msgid "Romanian" +msgstr "Romunsko" + +#: ../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 +msgid "Hebrew" +msgstr "Hebrejsko" + +#: ../src/encodings.c:109 +msgid "Hebrew Visual" +msgstr "Hebrejsko vizualno" + +#: ../src/encodings.c:111 +msgid "Armenian" +msgstr "Armensko" + +#: ../src/encodings.c:112 +msgid "Georgian" +msgstr "Gruzinsko" + +#: ../src/encodings.c:113 +msgid "Thai" +msgstr "Tajsko" + +#: ../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 +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 +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 "Kitajsko poenostavljeno" + +#: ../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:141 +msgid "Japanese" +msgstr "Japonsko" + +#: ../src/encodings.c:142 ../src/encodings.c:143 ../src/encodings.c:144 +#: ../src/encodings.c:145 +msgid "Korean" +msgstr "Korejsko" + +#: ../src/encodings.c:147 +msgid "Without encoding" +msgstr "Brez kodiranja" + +#: ../src/encodings.c:374 +msgid "_West European" +msgstr "_Zahodnoevropsko" + +#: ../src/encodings.c:380 +msgid "_East European" +msgstr "_Vzhodnoevropsko" + +#: ../src/encodings.c:386 +msgid "East _Asian" +msgstr "Vzhodno _azijsko" + +#: ../src/encodings.c:392 +msgid "_SE & SW Asian" +msgstr "_JV & JZ azijsko" + +#: ../src/encodings.c:398 +msgid "_Middle Eastern" +msgstr "_Bližnjevzhodno" + +#: ../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 "%s izvorna datoteka" + +#: ../src/filetypes.c:97 +#, fuzzy, 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 +msgid "None" +msgstr "Brez" + +#: ../src/filetypes.c:382 +msgid "Shell script file" +msgstr "Lupinski skript" + +#: ../src/filetypes.c:394 +msgid "Makefile" +msgstr "Datoteka gradnje" + +#: ../src/filetypes.c:406 +msgid "XML document" +msgstr "dokument XML" + +#: ../src/filetypes.c:441 +msgid "Cascading StyleSheet" +msgstr "Padajoča slogovna predloga (CSS)" + +#: ../src/filetypes.c:452 +msgid "SQL Dump file" +msgstr "SQL " + +#: ../src/filetypes.c:496 +msgid "Config file" +msgstr "Nastavitvena datoteka" + +#: ../src/filetypes.c:508 +msgid "Gettext translation file" +msgstr "Gettext datoteka s prevodi" + +#: ../src/filetypes.c:541 +#, c-format +msgid "%s script file" +msgstr "%s skriptna datoteka" + +#: ../src/filetypes.c:738 +msgid "_Programming Languages" +msgstr "_Programski jeziki" + +#: ../src/filetypes.c:739 +msgid "_Scripting Languages" +msgstr "_Skriptni jeziki" + +#: ../src/filetypes.c:740 +msgid "_Markup Languages" +msgstr "_Označevalni jeziki" + +#: ../src/filetypes.c:741 +msgid "M_iscellaneous Languages" +msgstr "_Drugi jeziki" + +#: ../src/filetypes.c:1331 ../src/win32.c:107 +msgid "All Source" +msgstr "Vsa izvorna koda" + +#: ../src/filetypes.c:1356 ../src/project.c:292 +msgid "All files" +msgstr "Vse datoteke" + +#: ../src/filetypes.c:1414 +#, c-format +msgid "Bad regex for filetype %s: %s" +msgstr "Slab regex za datotečno vrsto %s: %s" + +#: ../src/geany.h:53 +msgid "untitled" +msgstr "neimenovano" + +#: ../src/interface.c:276 +msgid "_File" +msgstr "_Datoteka" + +#: ../src/interface.c:287 +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 +msgid "Open Selected F_ile" +msgstr "Odpri _izbrano datoteko" + +#: ../src/interface.c:315 +msgid "Recent _Files" +msgstr "_Nedavne datoteke" + +#: ../src/interface.c:332 +msgid "Save A_ll" +msgstr "Shrani _vse" + +#: ../src/interface.c:348 +msgid "R_eload As" +msgstr "Pono_vno odpri kot" + +#: ../src/interface.c:376 +msgid "Page Set_up" +msgstr "Nastavitev _strani" + +#: ../src/interface.c:393 ../src/notebook.c:240 +msgid "Close Ot_her Documents" +msgstr "Zapri _ostale dokumente" + +# zapre vse dokumente +#: ../src/interface.c:401 ../src/notebook.c:245 +msgid "C_lose All" +msgstr "Zapri _vse" + +#: ../src/interface.c:418 +msgid "_Edit" +msgstr "_Uredi" + +#: ../src/interface.c:468 ../src/interface.c:1949 +msgid "_Format" +msgstr "_Oblika" + +#: ../src/interface.c:475 ../src/interface.c:1956 +msgid "T_oggle Case of Selection" +msgstr "Pre_obrni izbor" + +#: ../src/interface.c:484 ../src/interface.c:1965 +msgid "_Comment Line(s)" +msgstr "Zakomentiraj vrstico ali več vrstic" + +#: ../src/interface.c:488 ../src/interface.c:1969 +msgid "U_ncomment Line(s)" +msgstr "Odkomentiraj vrstico ali več vrstic" + +#: ../src/interface.c:492 ../src/interface.c:1973 +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 +msgid "_Increase Indent" +msgstr "_Povečaj zamik" + +#: ../src/interface.c:513 ../src/interface.c:1994 +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:530 ../src/interface.c:2011 +msgid "_Send Selection to" +msgstr "_Pošlji izbor v" + +#: ../src/interface.c:545 ../src/interface.c:2026 +msgid "I_nsert Comments" +msgstr "Vstavi _komentar" + +#: ../src/interface.c:556 ../src/interface.c:2037 +msgid "Insert _ChangeLog Entry" +msgstr "Vstavi vnos d_nevnika sprememb" + +#: ../src/interface.c:560 ../src/interface.c:2041 +msgid "Insert File _Header" +msgstr "Vstavi _zaglavje datoteke" + +#: ../src/interface.c:564 ../src/interface.c:2045 +msgid "Insert _Function Description" +msgstr "Vstavi opis _funkcije" + +#: ../src/interface.c:568 ../src/interface.c:2049 +msgid "Insert _Multiline Comment" +msgstr "Vstavi ve_čvrstični komentar" + +#: ../src/interface.c:572 ../src/interface.c:2053 +msgid "Insert _GPL Notice" +msgstr "Vstavi _GPL obvestilo" + +#: ../src/interface.c:576 ../src/interface.c:2057 +msgid "Insert _BSD License Notice" +msgstr "Vstavi _BSD obvestilo" + +#: ../src/interface.c:580 ../src/interface.c:2061 +msgid "Insert Dat_e" +msgstr "Vstavi _datum" + +#: ../src/interface.c:594 ../src/interface.c:2075 +msgid "_Insert \"include <...>\"" +msgstr "_Vstavi \"include <...>\"" + +#: ../src/interface.c:613 +msgid "Preference_s" +msgstr "_Možnosti" + +#: ../src/interface.c:621 +msgid "_Search" +msgstr "_Išči" + +#: ../src/interface.c:632 +msgid "Find _Next" +msgstr "Išči _naslednje" + +#: ../src/interface.c:636 +msgid "Find _Previous" +msgstr "Išči _predhodno" + +#: ../src/interface.c:640 +msgid "Find in F_iles" +msgstr "Išči v _datoteki" + +#: ../src/interface.c:644 ../src/search.c:524 +msgid "_Replace" +msgstr "_Zamenjaj" + +#: ../src/interface.c:657 +msgid "Find _Selected" +msgstr "Išči v _izboru" + +#: ../src/interface.c:661 +msgid "Find Pre_vious Selected" +msgstr "Išči v p_rejšnjem izboru" + +#: ../src/interface.c:670 +msgid "Next _Message" +msgstr "Naslednje _sporočilo" + +#: ../src/interface.c:674 +msgid "Pr_evious Message" +msgstr "Pr_ejšnje sporočilo" + +#: ../src/interface.c:683 ../src/interface.c:2127 +msgid "_Go to Line" +msgstr "Pojdi na vrs_tico" + +#: ../src/interface.c:698 +msgid "Change _Font" +msgstr "Spremeni _nabor znakov" + +#: ../src/interface.c:711 +msgid "To_ggle All Additional Widgets" +msgstr "Preklo_pi vse dodatne gradnike" + +#: ../src/interface.c:715 +msgid "Full_screen" +msgstr "_Celozaslonsko" + +#: ../src/interface.c:719 +msgid "Show Message _Window" +msgstr "Pokaži _sporočilno okno" + +#: ../src/interface.c:724 +msgid "Show _Toolbar" +msgstr "Pokaži _orodno vrstico" + +#: ../src/interface.c:729 +msgid "Show Side_bar" +msgstr "Pokaži s_transko vrstico" + +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 +msgid "Editor" +msgstr "Urejevalnik" + +#: ../src/interface.c:741 +msgid "Show _Markers Margin" +msgstr "Pokaži _rob oznak" + +#: ../src/interface.c:746 +msgid "Show _Line Numbers" +msgstr "Pokaži številke _vrstic" + +#: ../src/interface.c:751 +msgid "Show _White Space" +msgstr "Pokaži _prazne znake" + +#: ../src/interface.c:755 +msgid "Show Line _Endings" +msgstr "Prikaži _konce vrstic" + +#: ../src/interface.c:759 +msgid "Show _Indentation Guides" +msgstr "Pokaži vodila _zamikanja" + +#: ../src/interface.c:780 +msgid "_Document" +msgstr "_Dokument" + +#: ../src/interface.c:787 +msgid "_Line Wrapping" +msgstr "_Lomljenje vrstic" + +#: ../src/interface.c:792 +msgid "Line _Breaking" +msgstr "" + +#: ../src/interface.c:796 +msgid "_Auto-indentation" +msgstr "S_amozamikanje" + +#: ../src/interface.c:801 +msgid "In_dent Type" +msgstr "Vrsta _zamika" + +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 +msgid "_Tabs" +msgstr "_Razmaki" + +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 +msgid "_Spaces" +msgstr "_Presledki" + +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 +msgid "T_abs and Spaces" +msgstr "R_azmaki in presledki" + +#: ../src/interface.c:831 +msgid "Read _Only" +msgstr "Le za _branje" + +#: ../src/interface.c:835 +msgid "_Write Unicode BOM" +msgstr "_Zapiši Unicode BOM" + +#: ../src/interface.c:844 +msgid "Set File_type" +msgstr "Nastavi _tip datoteke" + +#: ../src/interface.c:854 +msgid "Set _Encoding" +msgstr "Nastavi _kodiranje" + +#: ../src/interface.c:864 +msgid "Set Line E_ndings" +msgstr "Nastavi ko_nce vrstic" + +#: ../src/interface.c:871 +msgid "Convert and Set to _CR/LF (Win)" +msgstr "Pretvori in nastavi na _CR/LF (Win)" + +#: ../src/interface.c:877 +msgid "Convert and Set to _LF (Unix)" +msgstr "Pretvori in nastavi na _LF (Unix)" + +#: ../src/interface.c:883 +msgid "Convert and Set to CR (_Mac)" +msgstr "Pretvori in nastavi na CR(_Mac)" + +#: ../src/interface.c:894 +msgid "_Strip Trailing Spaces" +msgstr "_Odreži presledke na repu" + +#: ../src/interface.c:898 +msgid "_Replace Tabs by Spaces" +msgstr "Zamenjaj _razmake s presledki" + +#: ../src/interface.c:902 +msgid "Replace Spaces b_y Tabs" +msgstr "Zamenjaj _presledke z razmaki" + +#: ../src/interface.c:911 +msgid "_Fold All" +msgstr "_Zvij vse" + +#: ../src/interface.c:915 +msgid "_Unfold All" +msgstr "_Odvij vse" + +#: ../src/interface.c:924 +msgid "Remove _Markers" +msgstr "Odstrani _oznake" + +#: ../src/interface.c:928 +msgid "Remove Error _Indicators" +msgstr "Odstrani oznake _napak" + +#: ../src/interface.c:932 +msgid "_Project" +msgstr "_Projekt" + +#: ../src/interface.c:939 +msgid "_New" +msgstr "_Nov" + +#: ../src/interface.c:947 +msgid "_Open" +msgstr "_Odpri" + +#: ../src/interface.c:955 +msgid "_Recent Projects" +msgstr "Ne_davni projekti" + +#: ../src/interface.c:959 +msgid "_Close" +msgstr "_Zapri" + +#: ../src/interface.c:980 +msgid "_Tools" +msgstr "_Orodja" + +#: ../src/interface.c:987 +msgid "_Color Chooser" +msgstr "_Barvni izbiralnik" + +#: ../src/interface.c:995 +msgid "_Word Count" +msgstr "_Preštevalnik besed" + +#: ../src/interface.c:999 +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 +msgid "_Help" +msgstr "_Pomoč" + +#: ../src/interface.c:1026 +msgid "_Website" +msgstr "_Splet" + +#: ../src/interface.c:1030 +msgid "_Keyboard Shortcuts" +msgstr "" + +#: ../src/interface.c:1034 +msgid "_Debug Messages" +msgstr "_Razhroščevalna sporočila" + +#: ../src/interface.c:1073 ../src/treeviews.c:119 +msgid "Symbols" +msgstr "Simboli" + +#: ../src/interface.c:1087 +msgid "Documents" +msgstr "Dokumenti" + +#: ../src/interface.c:1123 +msgid "Status" +msgstr "Stanje" + +#: ../src/interface.c:1137 +msgid "Compiler" +msgstr "Prevajalnik" + +#: ../src/interface.c:1152 +msgid "Messages" +msgstr "Sporočila" + +#: ../src/interface.c:1165 +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:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "_Skrij orodno vrstico" + +#: ../src/interface.c:2094 +msgid "Find _Usage" +msgstr "" + +#: ../src/interface.c:2102 +msgid "Find _Document Usage" +msgstr "" + +#: ../src/interface.c:2110 +msgid "Go to _Tag Definition" +msgstr "Pojdi na _opredelitev značke" + +#: ../src/interface.c:2114 +msgid "Go to T_ag Declaration" +msgstr "Pojdi na _navedbo značke" + +#: ../src/interface.c:2118 +msgid "Conte_xt Action" +msgstr "Dejanje _konteksta" + +#: ../src/interface.c:2667 ../src/keybindings.c:337 +msgid "Preferences" +msgstr "Možnosti" + +#: ../src/interface.c:2703 +msgid "Load files from the last session" +msgstr "Naloži datoteke prejšnje seje" + +#: ../src/interface.c:2706 +msgid "Opens at startup the files from the last session" +msgstr "Ob zagonu odpre datoteke iz zadnje seje" + +#: ../src/interface.c:2708 +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 "Enable plugin support" +msgstr "Omogoči podporo vstavkom" + +#: ../src/interface.c:2716 +msgid "Startup" +msgstr "Zagon" + +#: ../src/interface.c:2735 +msgid "Save window position and geometry" +msgstr "Shrani položaj in razmerja okna" + +#: ../src/interface.c:2738 +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" + +#: ../src/interface.c:2740 +msgid "Confirm exit" +msgstr "Potrdi izhod" + +#: ../src/interface.c:2743 +msgid "Shows a confirmation dialog on exit" +msgstr "Prikaže potrditveno okno ob izhodu" + +#: ../src/interface.c:2745 +msgid "Shutdown" +msgstr "Zaustavitev" + +#: ../src/interface.c:2766 +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:2791 +msgid "Project files:" +msgstr "Projektne datoteke:" + +#: ../src/interface.c:2803 +msgid "Path to start in when opening project files" +msgstr "" + +#: ../src/interface.c:2816 +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:2841 +msgid "Paths" +msgstr "Poti" + +#: ../src/interface.c:2846 +msgid "Startup" +msgstr "Zagon" + +#: ../src/interface.c:2868 +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:2873 +msgid "Switch to status message list at new message" +msgstr "" + +#: ../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:2878 +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." + +# Kot naslednji/As next +#: ../src/interface.c:2883 +#, fuzzy +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 +msgid "Miscellaneous" +msgstr "Raznotero" + +#: ../src/interface.c:2908 +msgid "Always wrap search and hide the Find dialog" +msgstr "" + +#: ../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:2913 +msgid "Use the current word under the cursor for Find dialogs" +msgstr "" + +#: ../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:2918 +msgid "Use the current file's directory for Find in Files" +msgstr "" + +#: ../src/interface.c:2922 +msgid "Search" +msgstr "Išči" + +#: ../src/interface.c:2941 +msgid "Use project-based session files" +msgstr "" + +#: ../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:2946 +msgid "Store project file inside the project base directory" +msgstr "" + +#: ../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:2951 +msgid "Projects" +msgstr "Projekti" + +#: ../src/interface.c:2956 +msgid "Miscellaneous" +msgstr "Raznotero" + +#: ../src/interface.c:2960 +msgid "General" +msgstr "Splošno" + +#: ../src/interface.c:2983 +msgid "Show symbol list" +msgstr "Pokaži seznam simbolov" + +#: ../src/interface.c:2986 +msgid "Toggle the symbol list on and off" +msgstr "Vklopi/izklopi seznam simbolov" + +#: ../src/interface.c:2988 +msgid "Show documents list" +msgstr "Pokaži seznam dokumentov" + +#: ../src/interface.c:2991 +msgid "Toggle the documents list on and off" +msgstr "Vklopi/izklopi seznam dokumentov" + +#: ../src/interface.c:2993 +msgid "Sidebar" +msgstr "Stranska vrstica" + +#: ../src/interface.c:3014 +msgid "Symbol list:" +msgstr "Seznam simbolov:" + +#: ../src/interface.c:3021 ../src/interface.c:3136 +msgid "Message window:" +msgstr "Sporočilno okno:" + +#: ../src/interface.c:3028 ../src/interface.c:3172 +msgid "Editor:" +msgstr "Urejevalnik:" + +#: ../src/interface.c:3040 +msgid "Sets the font for the message window" +msgstr "Nastavi nabor znakov za sporočilno okno" + +#: ../src/interface.c:3048 +msgid "Sets the font for the symbol list" +msgstr "Nastavi nabor znakov za seznam simbolov" + +#: ../src/interface.c:3056 +msgid "Sets the editor font" +msgstr "Nastavi nabor znakov za urejevalnik" + +#: ../src/interface.c:3058 +msgid "Fonts" +msgstr "Nabori znakov" + +#: ../src/interface.c:3077 +msgid "Show editor tabs" +msgstr "Pokaži razmake urejevalnika" + +#: ../src/interface.c:3081 +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:3090 +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 +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 +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 +msgid "Double-clicking hides all additional widgets" +msgstr "Dvoklik skrije vse dodatne gradnike" + +#: ../src/interface.c:3113 +msgid "Calls the View->Toggle All Additional Widgets command" +msgstr "Pokliče ukaz Pogled->Preklopi vse dodatne gradnike" + +#: ../src/interface.c:3115 +msgid "Editor tabs" +msgstr "Razmaki urejevalnika" + +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 +msgid "Top" +msgstr "Vrh" + +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 +msgid "Bottom" +msgstr "Dno" + +#: ../src/interface.c:3154 +msgid "Sidebar:" +msgstr "Stranska vrstica:" + +#: ../src/interface.c:3190 +msgid "Tab positions" +msgstr "Pozicije razmakov:" + +#: ../src/interface.c:3209 +msgid "Show status bar" +msgstr "Pokaži vrstico stanja" + +#: ../src/interface.c:3212 +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 +msgid "Interface" +msgstr "Vmesnik" + +#: ../src/interface.c:3242 +msgid "Show T_oolbar" +msgstr "P_okaži orodno vrstico" + +#: ../src/interface.c:3246 +msgid "_Append Toolbar to the Menu" +msgstr "Dod_aj orodno vrstico v meni" + +# Ni: Add --> Temveč: Pack +#: ../src/interface.c:3249 +msgid "Pack the toolbar to the main menu to save vertical space" +msgstr "" +"Dodaj orodno vrstico v glavni meni zaradi prihranka navpičnega prostora" + +#: ../src/interface.c:3251 +msgid "Toolbar" +msgstr "Orodna vrstica" + +#: ../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:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Pokaži _orodno vrstico" + +#: ../src/interface.c:3363 +msgid "Toolbar" +msgstr "Orodna vrstica" + +#: ../src/interface.c:3390 +msgid "Line wrapping" +msgstr "Prelom 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:3395 +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:3400 +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:3405 +msgid "Enable folding" +msgstr "Omogoči zvijanje" + +#: ../src/interface.c:3408 +msgid "Whether to enable folding the code" +msgstr "Ali naj bo zvijanje kode omogočeno" + +#: ../src/interface.c:3410 +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:3415 +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:3420 +msgid "Newline strips trailing spaces" +msgstr "Nova vrstica poreže presledke na repu" + +#: ../src/interface.c:3423 +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 +msgid "Line breaking column:" +msgstr "Prelomni stolpec vrstice:" + +#: ../src/interface.c:3443 +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:3452 +#, fuzzy +msgid "Features" +msgstr "Posebnosti" + +#: ../src/interface.c:3457 +#, fuzzy +msgid "Features" +msgstr "Posebnosti" + +#: ../src/interface.c:3489 ../src/interface.c:5057 +msgid "Auto-indent mode:" +msgstr "Samozamikalni način:" + +#: ../src/interface.c:3502 ../src/interface.c:5070 +msgid "Basic" +msgstr "Osnovno" + +#: ../src/interface.c:3503 ../src/interface.c:5071 +msgid "Current chars" +msgstr "Tekoči znaki" + +#: ../src/interface.c:3504 ../src/interface.c:5072 +msgid "Match braces" +msgstr "Ujemanje oklepajev" + +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 +msgid "Type:" +msgstr "Način:" + +#: ../src/interface.c:3513 ../src/interface.c:5081 +msgid "Width:" +msgstr "Širina:" + +#: ../src/interface.c:3526 ../src/interface.c:5094 +msgid "The width in chars of a single indent" +msgstr "Širina enega zamika v znakih" + +#: ../src/interface.c:3536 ../src/interface.c:5104 +msgid "Use spaces when inserting indentation" +msgstr "Uporabi presledke ob vrivanju zamikanja" + +#: ../src/interface.c:3545 ../src/interface.c:5113 +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: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" +msgstr "Ali naj se zazna način zamikanja iz vsebine datoteke ob njenem odprtju" + +#: ../src/interface.c:3589 +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:3594 +msgid "Indentation" +msgstr "Zamikanje" + +#: ../src/interface.c:3599 ../src/interface.c:5157 +msgid "Indentation" +msgstr "Zamikanje" + +#: ../src/interface.c:3622 +msgid "Snippet completion" +msgstr "" + +#: ../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:3627 +#, fuzzy +msgid "XML tag autocompletion" +msgstr "Samodokončanje XML značk" + +#: ../src/interface.c:3630 +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 +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:3637 +msgid "Autocomplete symbols" +msgstr "" + +#: ../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: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 "Največ predloženih imen simbolov:" + +#: ../src/interface.c:3663 +msgid "Completion list height:" +msgstr "Višina seznama dokončanja" + +#: ../src/interface.c:3670 +#, fuzzy +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:3692 +#, fuzzy +msgid "Display height in rows for the autocompletion list" +msgstr "Višina prikaza v vrsticah za seznam samodopolnjevanja" + +#: ../src/interface.c:3701 +#, fuzzy +msgid "Maximum number of entries to display in the autocompletion list" +msgstr "Največje število prikazanih vnosov v seznamu samodopolnjevanja" + +#: ../src/interface.c:3704 +msgid "Completions" +msgstr "Dopolnjevanja" + +#: ../src/interface.c:3724 +msgid "Parenthesis ( )" +msgstr "Oklepaji ()" + +#: ../src/interface.c:3729 +msgid "Auto-close parenthesis when typing an opening one" +msgstr "Samodejno zapri oklepaje med tipkanjem med odpiranjem" + +#: ../src/interface.c:3731 +msgid "Single quotes ' '" +msgstr "Enojni narekovaji ' '" + +#: ../src/interface.c:3736 +msgid "Auto-close simple quote when typing an opening one" +msgstr "Samodejno zapri enojne narekovaje med odpiranjem" + +#: ../src/interface.c:3738 +msgid "Curly brackets { }" +msgstr "Zaviti oklepaji { }" + +#: ../src/interface.c:3743 +msgid "Auto-close curly bracket when typing an opening one" +msgstr "Samodejno zapri zaviti oklepaje med tipkanjem" + +#: ../src/interface.c:3745 +msgid "Square brackets [ ]" +msgstr "Oglati oklepaji [ ]" + +#: ../src/interface.c:3750 +msgid "Auto-close square-bracket when typing an opening one" +msgstr "Samodejno zapri oglate oklepaje med tipkanjem" + +#: ../src/interface.c:3752 +msgid "Double quotes \" \"" +msgstr "Dvojni narekovaji \" \"" + +#: ../src/interface.c:3757 +msgid "Auto-close double quote when typing an opening one" +msgstr "Samodejno zapri dvojni narekovaje med tipkanjem" + +#: ../src/interface.c:3759 +msgid "Auto-close quotes and brackets" +msgstr "Samodejno zapri narekovaje in oklepaje" + +#: ../src/interface.c:3764 +msgid "Completions" +msgstr "Dopolnjevanja" + +#: ../src/interface.c:3787 +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:3792 +msgid "Show indentation guides" +msgstr "Pokaži vodila zamikanja" + +# right indent=pravilna ali desna? +#: ../src/interface.c:3795 +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" + +#: ../src/interface.c:3797 +msgid "Show white space" +msgstr "Pokaži prazni prostor" + +#: ../src/interface.c:3800 +msgid "Marks spaces with dots and tabs with arrows" +msgstr "Prikaže presledke kot pikice in razmake kot puščice" + +#: ../src/interface.c:3802 +msgid "Show line endings" +msgstr "Pokaži konec vrstice" + +#: ../src/interface.c:3805 +msgid "Shows the line ending character" +msgstr "Prikaže znak za konec vrstice" + +#: ../src/interface.c:3807 +msgid "Show line numbers" +msgstr "Pokaži številke vrstic" + +#: ../src/interface.c:3810 +msgid "Shows or hides the Line Number margin" +msgstr "Prikaže ali skrije rob s številkami vrstic" + +#: ../src/interface.c:3812 +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:3817 +msgid "Stop scrolling at last line" +msgstr "" + +#: ../src/interface.c:3820 +msgid "Whether to stop scrolling one page past the last line of a document" +msgstr "" + +#: ../src/interface.c:3822 +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:3869 +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 +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:3888 +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:3895 +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:3902 +msgid "Disabled" +msgstr "Onemogočeno" + +#: ../src/interface.c:3908 +msgid "Long line marker" +msgstr "Oznaka dolge vrste" + +#: ../src/interface.c:3913 +msgid "Display" +msgstr "Prikaz" + +# "Open"!="Create"; "Ustvari"=="Create"; "Start"=="Začni"; "Začni"==nonsense_translation; +#: ../src/interface.c:3944 +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 +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 +msgid "Default end of line characters:" +msgstr "Privzeti znaki konca vrstice:" + +#: ../src/interface.c:3968 +msgid "New files" +msgstr "Nove datoteke" + +#: ../src/interface.c:3994 +msgid "Sets the default encoding for newly created files" +msgstr "" + +#: ../src/interface.c:4000 +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: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:4032 +msgid "Encodings" +msgstr "Kodiranja" + +#: ../src/interface.c:4051 +msgid "Ensure new line at file end" +msgstr "" + +#: ../src/interface.c:4054 +msgid "Ensures that at the end of the file is a new line" +msgstr "" + +#: ../src/interface.c:4056 +msgid "Strip trailing spaces and tabs" +msgstr "" + +#: ../src/interface.c:4059 +msgid "Removes trailing spaces and tabs and the end of lines" +msgstr "" + +#: ../src/interface.c:4061 ../src/keybindings.c:460 +msgid "Replace tabs by space" +msgstr "" + +#: ../src/interface.c:4064 +msgid "Replaces all tabs in document by spaces" +msgstr "" + +#: ../src/interface.c:4066 +msgid "Saving files" +msgstr "Shranjevanje datotek" + +#: ../src/interface.c:4091 +msgid "Recent files list length:" +msgstr "" + +#: ../src/interface.c:4105 +msgid "Specifies the number of files which are stored in the Recent files list" +msgstr "" + +#: ../src/interface.c:4109 +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 "" + +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 +msgid "Files" +msgstr "" + +#: ../src/interface.c:4164 +msgid "Make:" +msgstr "" + +#: ../src/interface.c:4171 +msgid "Terminal:" +msgstr "" + +#: ../src/interface.c:4178 +msgid "Browser:" +msgstr "" + +#: ../src/interface.c:4190 +msgid "Path and options for the make tool" +msgstr "" + +#: ../src/interface.c:4197 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" + +#: ../src/interface.c:4204 +msgid "Path (and possibly additional arguments) to your favorite browser" +msgstr "" + +#: ../src/interface.c:4236 +msgid "Grep:" +msgstr "" + +#: ../src/interface.c:4259 +msgid "Tool paths" +msgstr "Poti do orodij" + +#: ../src/interface.c:4280 +msgid "Context action:" +msgstr "" + +#: ../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 "" + +#: ../src/interface.c:4304 +msgid "Commands" +msgstr "Ukazi" + +#: ../src/interface.c:4309 ../src/keybindings.c:496 +msgid "Tools" +msgstr "" + +#: ../src/interface.c:4343 +msgid "email address of the developer" +msgstr "e-poštni naslov razvijalca" + +#: ../src/interface.c:4350 +msgid "Initials of the developer name" +msgstr "Začetnice razvijalca" + +#: ../src/interface.c:4352 +msgid "Initial version:" +msgstr "Začetna različica:" + +#: ../src/interface.c:4364 +msgid "Version number, which a new file initially has" +msgstr "Različica, ki jo nosi nova datoteka ob nastanku" + +#: ../src/interface.c:4371 +msgid "Company name" +msgstr "Ime družbe" + +#: ../src/interface.c:4373 +msgid "Developer:" +msgstr "Razvijalec:" + +#: ../src/interface.c:4380 +msgid "Company:" +msgstr "Družba:" + +#: ../src/interface.c:4387 +msgid "Mail address:" +msgstr "E-naslov:" + +#: ../src/interface.c:4394 +msgid "Initials:" +msgstr "Začetnice:" + +#: ../src/interface.c:4406 +msgid "The name of the developer" +msgstr "Ime razvijalca:" + +#: ../src/interface.c:4408 +msgid "Year:" +msgstr "Leto:" + +#: ../src/interface.c:4415 +msgid "Date:" +msgstr "Datum:" + +#: ../src/interface.c:4422 +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: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: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:4450 +msgid "Template data" +msgstr "Podatki predlog" + +#: ../src/interface.c:4455 +msgid "Templates" +msgstr "Predloge" + +#: ../src/interface.c:4493 +msgid "C_hange" +msgstr "" + +#: ../src/interface.c:4497 +msgid "Keyboard shortcuts" +msgstr "Bližnjice tipkovnice" + +#: ../src/interface.c:4502 +msgid "Keybindings" +msgstr "" + +#: ../src/interface.c:4525 +msgid "Command:" +msgstr "Ukaz:" + +#: ../src/interface.c:4532 +#, 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 +msgid "Use an external command for printing" +msgstr "Uporabi zunanji ukaz za tiskanje" + +#: ../src/interface.c:4562 ../src/printing.c:380 +msgid "Print line numbers" +msgstr "Natisni številke vrstic" + +#: ../src/interface.c:4565 ../src/printing.c:382 +msgid "Add line numbers to the printed page" +msgstr "Doda številke vrstic na natisnjeno stran" + +#: ../src/interface.c:4567 ../src/printing.c:385 +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:4572 ../src/printing.c:390 +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:4592 ../src/printing.c:408 +msgid "Use the basename of the printed file" +msgstr "Uporabi skrajšano ime natisnjene datoteke" + +#: ../src/interface.c:4595 +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 +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:4611 +msgid "Use native GTK printing" +msgstr "Uporabi vgrajeno GTK tiskanje" + +#: ../src/interface.c:4617 +msgid "Printing" +msgstr "Tiskanje" + +#: ../src/interface.c:5040 +msgid "Project Properties" +msgstr "Lastnosti projekta" + +#: ../src/keybindings.c:198 ../src/plugins.c:1099 +msgid "File" +msgstr "Datoteka" + +#: ../src/keybindings.c:201 +msgid "New" +msgstr "Novo" + +#: ../src/keybindings.c:203 +msgid "Open" +msgstr "Odpri" + +#: ../src/keybindings.c:206 +msgid "Open selected file" +msgstr "Odpri izbrano datoteko" + +#: ../src/keybindings.c:208 +msgid "Save" +msgstr "Shrani" + +#: ../src/keybindings.c:210 +msgid "Save as" +msgstr "Shrani kot" + +#: ../src/keybindings.c:212 +msgid "Save all" +msgstr "Shrani vse" + +#: ../src/keybindings.c:215 +msgid "Print" +msgstr "Natisni" + +#: ../src/keybindings.c:217 +msgid "Close" +msgstr "Zapri" + +#: ../src/keybindings.c:219 +msgid "Close all" +msgstr "Zapri vse" + +#: ../src/keybindings.c:222 +msgid "Reload file" +msgstr "Ponovno odpre datoteko" + +#: ../src/keybindings.c:224 ../src/project.c:495 +msgid "Project" +msgstr "Projekt" + +#: ../src/keybindings.c:227 +msgid "Project properties" +msgstr "Lastnosti projekta" + +#: ../src/keybindings.c:232 +msgid "Undo" +msgstr "Razveljavi" + +#: ../src/keybindings.c:234 +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 +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" + +#: ../src/keybindings.c:246 +msgid "Scroll to current line" +msgstr "" + +#: ../src/keybindings.c:248 +msgid "Scroll up the view by one line" +msgstr "" + +#: ../src/keybindings.c:250 +msgid "Scroll down the view by one line" +msgstr "" + +#: ../src/keybindings.c:253 +msgid "Complete snippet" +msgstr "" + +#: ../src/keybindings.c:255 +msgid "Move cursor in snippet" +msgstr "" + +#: ../src/keybindings.c:257 +msgid "Suppress snippet completion" +msgstr "" + +#: ../src/keybindings.c:259 +msgid "Context Action" +msgstr "" + +#: ../src/keybindings.c:261 +msgid "Complete word" +msgstr "" + +#: ../src/keybindings.c:263 +msgid "Show calltip" +msgstr "" + +#: ../src/keybindings.c:265 +msgid "Show macro list" +msgstr "Prikaži seznam makrojev" + +#: ../src/keybindings.c:267 +msgid "Clipboard" +msgstr "Odložišče" + +#: ../src/keybindings.c:270 +msgid "Cut" +msgstr "Izreži" + +#: ../src/keybindings.c:272 +msgid "Copy" +msgstr "Kopiraj" + +#: ../src/keybindings.c:274 +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 +msgid "Select" +msgstr "Izberi" + +#: ../src/keybindings.c:283 +msgid "Select All" +msgstr "Izberi vse" + +#: ../src/keybindings.c:285 +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:291 +msgid "Format" +msgstr "Oblika" + +#: ../src/keybindings.c:295 +msgid "Toggle Case of Selection" +msgstr "Preklopi velikost izbora" + +#: ../src/keybindings.c:297 +msgid "Toggle line commentation" +msgstr "Preklopi komentiranje vrstic" + +#: ../src/keybindings.c:300 +msgid "Comment line(s)" +msgstr "Komentiraj vrstico ali več vrstic" + +#: ../src/keybindings.c:302 +msgid "Uncomment line(s)" +msgstr "Odkomentiraj vrstico ali več vrstic" + +#: ../src/keybindings.c:304 +msgid "Increase indent" +msgstr "Povečaj zamik" + +#: ../src/keybindings.c:307 +msgid "Decrease indent" +msgstr "Zmanjšaj zamik" + +#: ../src/keybindings.c:310 +msgid "Increase indent by one space" +msgstr "Povečaj zamik za presledek" + +#: ../src/keybindings.c:312 +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 +msgid "Send to Custom Command 1" +msgstr "Nastavi na ukaz po meri 1" + +#: ../src/keybindings.c:318 +msgid "Send to Custom Command 2" +msgstr "Nastavi na ukaz po meri 2" + +#: ../src/keybindings.c:320 +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 +msgid "Insert" +msgstr "Vstavi" + +#: ../src/keybindings.c:329 +msgid "Insert date" +msgstr "Vstavi datum" + +#: ../src/keybindings.c:332 +msgid "Insert alternative white space" +msgstr "Vstavi alternativni presledek" + +#: ../src/keybindings.c:334 +msgid "Settings" +msgstr "Nastavitve" + +#: ../src/keybindings.c:340 ../src/toolbar.c:350 +msgid "Search" +msgstr "Išči" + +#: ../src/keybindings.c:343 ../src/search.c:379 +msgid "Find" +msgstr "Najdi" + +#: ../src/keybindings.c:345 +msgid "Find Next" +msgstr "Najdi naslednje" + +#: ../src/keybindings.c:347 +msgid "Find Previous" +msgstr "Najdi predhodno" + +#: ../src/keybindings.c:350 +msgid "Find Next Selection" +msgstr "Najdi naslednjo izbiro" + +#: ../src/keybindings.c:352 +msgid "Find Previous Selection" +msgstr "Najdi predhodno izbiro" + +#: ../src/keybindings.c:354 ../src/search.c:514 +msgid "Replace" +msgstr "Zamenjaj" + +#: ../src/keybindings.c:356 ../src/search.c:686 +msgid "Find in Files" +msgstr "Najdi v datotekah" + +#: ../src/keybindings.c:359 +msgid "Next Message" +msgstr "Naslednje sporočilo" + +#: ../src/keybindings.c:361 +msgid "Previous Message" +msgstr "Predhodno sporočilo" + +#: ../src/keybindings.c:363 +msgid "Find Usage" +msgstr "" + +#: ../src/keybindings.c:365 +msgid "Find Document Usage" +msgstr "" + +# zgradi izvorno kodo z make all +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Zgradi _vse" + +#: ../src/keybindings.c:369 +msgid "Go to" +msgstr "Pojdi" + +#: ../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 "Pojdi na ujemajoči oklepaj" + +#: ../src/keybindings.c:382 +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 +msgid "Go to Tag Definition" +msgstr "Pojdi na opredelitev značke" + +#: ../src/keybindings.c:392 +msgid "Go to Tag Declaration" +msgstr "Pojdi na navedbo značke" + +#: ../src/keybindings.c:394 +msgid "Go to Start of Line" +msgstr "Pojdi na začetek vrstice " + +#: ../src/keybindings.c:396 +msgid "Go to End of Line" +msgstr "Pojdi na konec vrstice" + +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Pojdi na konec vrstice" + +#: ../src/keybindings.c:400 +msgid "Go to Previous Word Part" +msgstr "Pojdi na predhodni del besede" + +#: ../src/keybindings.c:402 +msgid "Go to Next Word Part" +msgstr "Pojdi na naslednji del besede" + +#: ../src/keybindings.c:404 +msgid "View" +msgstr "Pogled" + +#: ../src/keybindings.c:407 +msgid "Toggle All Additional Widgets" +msgstr "Preklopi vse dodatne gradnike" + +#: ../src/keybindings.c:410 +msgid "Fullscreen" +msgstr "Celozaslonsko" + +#: ../src/keybindings.c:412 +msgid "Toggle Messages Window" +msgstr "Preklopi sporočilno okno" + +#: ../src/keybindings.c:415 +msgid "Toggle Sidebar" +msgstr "Preklopi stransko vrstico" + +#: ../src/keybindings.c:417 +msgid "Zoom In" +msgstr "Približaj" + +#: ../src/keybindings.c:419 +msgid "Zoom Out" +msgstr "Oddalji" + +#: ../src/keybindings.c:421 +msgid "Focus" +msgstr "Žarišče" + +#: ../src/keybindings.c:424 +msgid "Switch to Editor" +msgstr "Preklopi v urejevalnik" + +#: ../src/keybindings.c:426 +msgid "Switch to Scribble" +msgstr "Preklopi v beležko" + +#: ../src/keybindings.c:428 +msgid "Switch to VTE" +msgstr "Preklopi v VTE" + +#: ../src/keybindings.c:430 +msgid "Switch to Search Bar" +msgstr "Preklopi v iskalno vrstico" + +#: ../src/keybindings.c:432 +msgid "Switch to Sidebar" +msgstr "Preklopi v stransko vrstico" + +#: ../src/keybindings.c:434 +msgid "Switch to Compiler" +msgstr "Preklopi v prevajalnik" + +#: ../src/keybindings.c:436 +msgid "Notebook tab" +msgstr "Zavihek zvezka" + +#: ../src/keybindings.c:439 +msgid "Switch to left document" +msgstr "Preklopi v levi dokument" + +#: ../src/keybindings.c:441 +msgid "Switch to right document" +msgstr "Preklopi v desni dokument" + +#: ../src/keybindings.c:443 +msgid "Switch to last used document" +msgstr "Preklopi v zadnji uporabljeni dokument" + +#: ../src/keybindings.c:445 +msgid "Move document left" +msgstr "Premakni dokument levo" + +#: ../src/keybindings.c:447 +msgid "Move document right" +msgstr "Premakni dokument desno" + +#: ../src/keybindings.c:449 +msgid "Move document first" +msgstr "Premakni dokument na prvo mesto" + +#: ../src/keybindings.c:451 +msgid "Move document last" +msgstr "Premakni dokument na zadnje mesto" + +#: ../src/keybindings.c:453 +msgid "Document" +msgstr "Dokument" + +#: ../src/keybindings.c:456 +msgid "Toggle Line wrapping" +msgstr "" + +#: ../src/keybindings.c:458 +msgid "Toggle Line breaking" +msgstr "" + +#: ../src/keybindings.c:462 +msgid "Replace spaces by tabs" +msgstr "Zamenjaj presledke z razmaki" + +#: ../src/keybindings.c:464 +msgid "Toggle current fold" +msgstr "Preklopi trenutno zvijanje" + +#: ../src/keybindings.c:466 +msgid "Fold all" +msgstr "Zvij vse" + +#: ../src/keybindings.c:468 +msgid "Unfold all" +msgstr "Odvij vse" + +#: ../src/keybindings.c:470 +msgid "Reload symbol list" +msgstr "Osveži seznam simbolov" + +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 +msgid "Build" +msgstr "Zgradi" + +#: ../src/keybindings.c:475 ../src/toolbar.c:68 +msgid "Compile" +msgstr "Prevedi" + +#: ../src/keybindings.c:479 +msgid "Make all" +msgstr "Zgradi vse" + +#: ../src/keybindings.c:482 +msgid "Make custom target" +msgstr "Zgradi tarčo po meri" + +#: ../src/keybindings.c:484 +msgid "Make object" +msgstr "Zgradi objekt" + +#: ../src/keybindings.c:486 +msgid "Next error" +msgstr "Naslednja napaka" + +#: ../src/keybindings.c:488 +msgid "Previous error" +msgstr "Predhodna napaka" + +#: ../src/keybindings.c:490 +msgid "Run" +msgstr "Zaženi" + +#: ../src/keybindings.c:492 +msgid "Run (alternative command)" +msgstr "Zaženi (alternativni ukaz)" + +#: ../src/keybindings.c:494 +msgid "Build options" +msgstr "Možnosti gradnje" + +#: ../src/keybindings.c:499 +msgid "Show Color Chooser" +msgstr "Prikaži barvni izbiralnik" + +#: ../src/keybindings.c:501 ../src/keybindings.c:504 +msgid "Help" +msgstr "Pomoč" + +#: ../src/keybindings.c:799 +msgid "Keyboard Shortcuts" +msgstr "Bližnjice tipkovnice" + +#: ../src/keybindings.c:812 +msgid "The following keyboard shortcuts are configurable:" +msgstr "Naslednje bližnjice tipkovnice so nastavljive:" + +#: ../src/keybindings.c:1583 +msgid "Switch to Document" +msgstr "Preklopi v dokument" + +#: ../src/keyfile.c:811 +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 +msgid "Failed to load one or more session files." +msgstr "Spodletelo nalaganje ene ali večih datotek seje." + +#: ../src/log.c:181 +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/main.c:125 +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 +msgid "Print internal filetype names" +msgstr "Natisni notranja imena tipov datotek" + +#: ../src/main.c:128 +msgid "Generate global tags file (see documentation)" +msgstr "Ustvari splošno datoteko (glej dokumentacijo)" + +#: ../src/main.c:129 +msgid "Don't preprocess C/C++ files when generating tags" +msgstr "" + +# instance==izvod +#: ../src/main.c:132 +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 +msgid "Set initial line number for the first opened file" +msgstr "" + +#: ../src/main.c:135 +msgid "Don't show message window at startup" +msgstr "Ne prikaži sporočilnega okna ob zagonu" + +#: ../src/main.c:136 +msgid "Don't load auto completion data (see documentation)" +msgstr "Ne naloži podatkov za samodejno dopolnjevanje (glej dokumentacijo)" + +#: ../src/main.c:138 +msgid "Don't load plugins" +msgstr "Ne naloži vstavkov" + +#: ../src/main.c:140 +msgid "Print Geany's installation prefix" +msgstr "Izpiši Geanyjevo namestitveno predpono" + +#: ../src/main.c:141 +msgid "Don't load the previous session's files" +msgstr "Ne naloži datotek prejšnje seje" + +#: ../src/main.c:143 +msgid "Don't load terminal support" +msgstr "Ne naloži podpore terminalu" + +#: ../src/main.c:144 +msgid "Filename of libvte.so" +msgstr "Ime datoteke libvte.so" + +#: ../src/main.c:147 +msgid "Show version and exit" +msgstr "Prikaži različico in zaključi" + +#: ../src/main.c:470 +msgid "[FILES...]" +msgstr "" + +#: ../src/main.c:487 +#, 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 +msgid "Move it now?" +msgstr "Premaknem zdaj?" + +#: ../src/main.c:594 +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 +#, c-format +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 +#, 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." + +#: ../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 "" +"Nastavitvene mape ni bilo možno ustvariti (%s).\n" +"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 +#, c-format +msgid "This is Geany %s." +msgstr "To je Geany %s." + +#: ../src/main.c:992 +#, c-format +msgid "Configuration directory could not be created (%s)." +msgstr "Nastavitvene mape ni bilo mogoče ustvariti (%s)." + +#: ../src/main.c:1224 +msgid "Configuration files reloaded." +msgstr "Osvežene nastavitvene datoteke." + +#: ../src/msgwindow.c:135 +msgid "Status messages" +msgstr "Sporočila stanja" + +#: ../src/msgwindow.c:515 +msgid "Copy _All" +msgstr "Kopiraj _vse" + +#: ../src/msgwindow.c:545 +msgid "_Hide Message Window" +msgstr "_Skrij sporočilno okno" + +#: ../src/plugins.c:425 +#, 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:869 +msgid "_Plugin Manager" +msgstr "_Upravitelj vstavkov" + +#: ../src/plugins.c:1017 +#, c-format +msgid "" +"Plugin: %s %s\n" +"Description: %s\n" +"Author(s): %s" +msgstr "" +"Vstavek: %s %s\n" +"Opis: %s\n" +"Avtor(ji): %s" + +#: ../src/plugins.c:1087 +msgid "Active" +msgstr "Aktiven" + +#: ../src/plugins.c:1093 +msgid "Plugin" +msgstr "Vstavek" + +#: ../src/plugins.c:1117 +msgid "No plugins available." +msgstr "Ni vstavkov na voljo." + +#: ../src/plugins.c:1230 +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:1263 +msgid "Plugin details:" +msgstr "Podrobnosti o vstavku:" + +#: ../src/prefs.c:160 +msgid "Grab Key" +msgstr "Zagrabi tipko" + +#: ../src/prefs.c:166 +#, 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 +msgid "_Expand All" +msgstr "_Razširi vse" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Dejanje" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Bližnjica" + +#: ../src/prefs.c:1398 +msgid "_Override" +msgstr "_Prezri" + +#: ../src/prefs.c:1399 +msgid "Override that keybinding?" +msgstr "Naj bodo povezave tipk prezrte? " + +#: ../src/prefs.c:1400 +#, c-format +msgid "The combination '%s' is already used for \"%s\"." +msgstr "Kombinacije '%s' se že uporablja za \"%s\". " + +# 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 +msgid "Enter tool paths below. Tools you do not need can be left blank." +msgstr "" + +#. 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." + +#. 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 "" + +#. 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 "" + +#. page Editor->Indentation +#: ../src/prefs.c:1540 +msgid "" +"Warning: these settings are overridden by the current project. See " +"Project->Properties." +msgstr "" + +#: ../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 "" + +#: ../src/printing.c:375 +msgid "Document Setup" +msgstr "Nastavitev dokumenta" + +#: ../src/printing.c:410 +msgid "Print only the basename(without the path) of the printed file" +msgstr "" + +#: ../src/printing.c:526 +#, c-format +msgid "Page %d of %d" +msgstr "Stran %d od %d" + +#: ../src/printing.c:776 +#, c-format +msgid "Printing of file %s was cancelled." +msgstr "Tiskanje datoteke %s je bilo preklicano." + +#: ../src/printing.c:778 ../src/printing.c:897 +#, c-format +msgid "File %s printed." +msgstr "Datoteka %s natisnjena." + +#: ../src/printing.c:827 +#, c-format +msgid "Printing of %s failed (%s)." +msgstr "Tiskanje %s spodletelo (%s)." + +#: ../src/printing.c:867 +msgid "Please set a print command in the preferences dialog first." +msgstr "" + +#: ../src/printing.c:875 +#, c-format +msgid "" +"The file \"%s\" will be printed with the following command:\n" +"\n" +"%s" +msgstr "" + +#: ../src/printing.c:891 +#, c-format +msgid "Printing of \"%s\" failed (return code: %s)." +msgstr "" + +# "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 +msgid "projects" +msgstr "projekti" + +#: ../src/project.c:118 +msgid "New Project" +msgstr "Nov projekt" + +#: ../src/project.c:126 +msgid "C_reate" +msgstr "Ustva_ri" + +#: ../src/project.c:140 ../src/project.c:386 +msgid "Name:" +msgstr "Ime:" + +#: ../src/project.c:149 ../src/project.c:399 +msgid "Filename:" +msgstr "Ime datoteke:" + +#: ../src/project.c:165 ../src/project.c:429 +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:174 ../src/project.c:441 +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 +#, 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 +msgid "Open Project" +msgstr "Odpri projekt" + +#: ../src/project.c:296 +msgid "Project files" +msgstr "Projektne datoteke" + +#: ../src/project.c:330 +#, c-format +msgid "Project \"%s\" closed." +msgstr "Projekt \"%s\" zaprt." + +#: ../src/project.c:412 +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:476 +msgid "File patterns:" +msgstr "Datotečni vzorci:" + +#: ../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 "_Prejšnji" + +#: ../src/search.c:392 +msgid "_Next" +msgstr "_Naslednji" + +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 +msgid "_Search for:" +msgstr "_Išči:" + +#. Now add the multiple match options +#: ../src/search.c:424 +msgid "_Find All" +msgstr "_Najdi vse" + +#: ../src/search.c:431 +msgid "_Mark" +msgstr "_Označi" + +#: ../src/search.c:433 +msgid "Mark all matches in the current document" +msgstr "Označi vsa ujemanja v trenutnem dokumentu" + +#: ../src/search.c:438 ../src/search.c:595 +msgid "In Sessi_on" +msgstr "_V seji" + +#: ../src/search.c:443 ../src/search.c:600 +msgid "_In Document" +msgstr "V _dokumentu" + +# close window checkbox +#. close window checkbox +#: ../src/search.c:449 ../src/search.c:613 +msgid "Close _dialog" +msgstr "_Zapri pogovorno okno" + +#: ../src/search.c:454 ../src/search.c:618 +msgid "Disable this option to keep the dialog open" +msgstr "Onemogoči to možnost da ohrani odprto pogovorno okno" + +#: ../src/search.c:529 +msgid "Replace & Fi_nd" +msgstr "Najdi & _zamenjaj" + +#: ../src/search.c:538 +msgid "Replace wit_h:" +msgstr "Za_menjaj z:" + +#. Now add the multiple replace options +#: ../src/search.c:588 +msgid "Re_place All" +msgstr "Zamenjaj _vse" + +#: ../src/search.c:605 +msgid "In Se_lection" +msgstr "V i_zboru" + +#: ../src/search.c:607 +msgid "Replace all matches found in the currently selected text" +msgstr "Zamenja vse pojavitve podbesedila v izbranem besedilu" + +#: ../src/search.c:696 +msgid "_Directory:" +msgstr "_Imenik:" + +#: ../src/search.c:727 +msgid "E_ncoding:" +msgstr "Kodi_ranje:" + +#: ../src/search.c:752 +msgid "Fixed s_trings" +msgstr "Fiksni _nizi" + +#: ../src/search.c:761 +msgid "_Grep regular expressions" +msgstr "_Grepovi regularni izrazi" + +#: ../src/search.c:764 ../src/search.c:772 +msgid "See grep's manual page for more information" +msgstr "" +"Za več informacij glej grepov priročnik (man grep ali info grep v terminalu)." + +#: ../src/search.c:769 +msgid "_Extended regular expressions" +msgstr "_Razširjeni regularni izrazi" + +#: ../src/search.c:776 +msgid "_Recurse in subfolders" +msgstr "_Ponavljaj v podimenikih" + +#: ../src/search.c:792 +msgid "_Invert search results" +msgstr "_Obrni iskalne zadetke" + +#: ../src/search.c:797 +msgid "Invert the sense of matching, to select non-matching lines" +msgstr "Obrne zadetke iskanja in tako izbere nezadete vrstice" + +#: ../src/search.c:814 +msgid "E_xtra options:" +msgstr "_Dodatne možnosti:" + +#: ../src/search.c:822 +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 +#, 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] "" + +#: ../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] "" +msgstr[2] "" +msgstr[3] "" + +#: ../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"), +#. &(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"), +#. &(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 "H1 naslovi" + +#: ../src/symbols.c:684 +msgid "H2 Headings" +msgstr "H2 naslovi" + +#: ../src/symbols.c:685 +msgid "H3 Headings" +msgstr "H3 naslovi" + +#: ../src/symbols.c:693 +msgid "ID Selectors" +msgstr "ID izbirniki" + +#: ../src/symbols.c:694 +msgid "Type Selectors" +msgstr "Izbirniki tipov" + +#: ../src/symbols.c:710 +msgid "Modules" +msgstr "Moduli" + +#: ../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 "Metode" + +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Lastnosti" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Izvozi" + +#: ../src/symbols.c:766 ../src/symbols.c:855 +msgid "Members" +msgstr "Člani" + +#: ../src/symbols.c:806 ../src/symbols.c:829 +msgid "Labels" +msgstr "Oznake" + +#: ../src/symbols.c:818 +msgid "Subroutines" +msgstr "Podprogrami" + +#: ../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 "Neznana datotečna vrsta za \"%s\".\n" + +#: ../src/symbols.c:1358 +#, 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" + +#: ../src/symbols.c:1365 +#, c-format +msgid "" +"Usage: %s -g \n" +"\n" +msgstr "" +"Uporaba: %s -g \n" +"\n" + +#: ../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 "" +"Primer:\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 +msgid "Load Tags" +msgstr "Naloži značke" + +#: ../src/symbols.c:1387 +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 +#, c-format +msgid "Loaded %s tags file '%s'." +msgstr "Naložene %s značke iz datoteke z značkami '%s'." + +#: ../src/symbols.c:1409 +#, c-format +msgid "Could not load tags file '%s'." +msgstr "Ni možno naložiti datoteke z značkami '%s'." + +#: ../src/symbols.c:1555 +#, c-format +msgid "Forward declaration \"%s\" not found." +msgstr "Navedba \"forward\" \"%s\" ni najdena." + +#: ../src/symbols.c:1557 +#, c-format +msgid "Definition of \"%s\" not found." +msgstr "Opredelitev \"%s\" ni najdena." + +#: ../src/symbols.c:1863 +msgid "Sort by _Name" +msgstr "Uredi po _imenu" + +#: ../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 "Shrani trenutno datoteko" + +#: ../src/toolbar.c:56 +msgid "Save all open files" +msgstr "Shrani vse odprte datoteke" + +#: ../src/toolbar.c:57 +msgid "Reload the current file from disk" +msgstr "Ponovno odpre trenutno datoteko na disku" + +#: ../src/toolbar.c:58 +msgid "Close the current file" +msgstr "Zapri trenutno datoteko" + +#: ../src/toolbar.c:59 +msgid "Close all open files" +msgstr "Zapri vse odprte datoteke" + +#: ../src/toolbar.c:60 +msgid "Cut the current selection" +msgstr "Izreži tekočo izbiro" + +#: ../src/toolbar.c:61 +msgid "Copy the current selection" +msgstr "Kopiraj tekočo izbiro" + +#: ../src/toolbar.c:62 +msgid "Paste the contents of the clipboard" +msgstr "Prilepi vsebino odložišča" + +#: ../src/toolbar.c:63 +msgid "Delete the current selection" +msgstr "Zbriši trenutno izbiro" + +#: ../src/toolbar.c:64 +msgid "Undo the last modification" +msgstr "Razveljavi zadnjo spremembo" + +#: ../src/toolbar.c:65 +msgid "Redo the last modification" +msgstr "Ponovi zadnjo spremembo" + +#: ../src/toolbar.c:68 +msgid "Compile the current file" +msgstr "Prevedi trenutno datoteko" + +#: ../src/toolbar.c:69 +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" + +#: ../src/toolbar.c:72 +msgid "Zoom out the text" +msgstr "Zmanjša besedilo" + +#: ../src/toolbar.c:73 +msgid "Decrease indentation" +msgstr "Zmanjša zamik" + +#: ../src/toolbar.c:74 +msgid "Increase indentation" +msgstr "Poveča zamik" + +#: ../src/toolbar.c:75 ../src/toolbar.c:350 +msgid "Find the entered text in the current file" +msgstr "Najdi vneseno besedilo v trenutni datoteki" + +#: ../src/toolbar.c:76 ../src/toolbar.c:358 +msgid "Jump to the entered line number" +msgstr "Skoči na vneseno številko vrstice" + +#: ../src/toolbar.c:77 +msgid "Show the preferences dialog" +msgstr "Pokaži pogovorno okno možnosti" + +#: ../src/toolbar.c:78 +msgid "Quit Geany" +msgstr "Zapusti Geany" + +#: ../src/toolbar.c:79 +msgid "Print document" +msgstr "Natisni dokument" + +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Označi vsa ujemanja v trenutnem dokumentu" + +#. Create our custom actions +#: ../src/toolbar.c:334 +msgid "Create a new file" +msgstr "Ustvari novo datoteko" + +#: ../src/toolbar.c:339 +msgid "Open an existing file" +msgstr "Odpri obstoječo datoteko" + +#: ../src/toolbar.c:358 +msgid "Goto" +msgstr "Pojdi" + +#: ../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 "Prikaz" + +#: ../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" + +#: ../src/tools.c:219 +msgid "The executed custom command exited with an unsuccessful exit code." +msgstr "Izvajani ukaz po meri se je končal z izhodno kodo neuspeha." + +#: ../src/tools.c:246 +#, c-format +msgid "Passing data and executing custom command: %s" +msgstr "Posredovanje podatkov in izvajanje ukaza po meri: %s" + +#: ../src/tools.c:290 +#, c-format +msgid "Custom command failed: %s" +msgstr "Ukaz po meri je spodletel: %s" + +#: ../src/tools.c:304 ../src/tools.c:538 +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 "" + +#: ../src/tools.c:506 ../src/tools.c:510 +msgid "No custom commands defined." +msgstr "Ni nastavljenih ukazov po meri." + +#: ../src/tools.c:615 +msgid "Word Count" +msgstr "Štetje besed" + +#: ../src/tools.c:625 +msgid "selection" +msgstr "izbor" + +#: ../src/tools.c:631 +msgid "whole document" +msgstr "celoten dokument" + +#: ../src/tools.c:640 +msgid "Range:" +msgstr "Obseg:" + +#: ../src/tools.c:652 +msgid "Lines:" +msgstr "Vrstice:" + +#: ../src/tools.c:666 +msgid "Words:" +msgstr "Besede:" + +#: ../src/tools.c:680 +msgid "Characters:" +msgstr "Znaki:" + +#: ../src/treeviews.c:177 +msgid "No tags found" +msgstr "Ni najdenih značk" + +#: ../src/treeviews.c:508 +msgid "Show S_ymbol List" +msgstr "Pokaži seznam sim_bolov" + +#: ../src/treeviews.c:516 +msgid "Show _Document List" +msgstr "Pokaži seznam _dokumentov" + +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 +msgid "H_ide Sidebar" +msgstr "Skr_ij stransko vrstico" + +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Pokaži vrstico stanja" + +# Status bar statistics: col = column, sel = selection. +#. 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 "vrstica: %d\t stolp: %d\t izbor: %d\t" + +#. RO = read-only +#: ../src/ui_utils.c:194 +msgid "RO " +msgstr "RO " + +#. OVR = overwrite/overtype, INS = insert +#: ../src/ui_utils.c:196 +msgid "OVR" +msgstr "PRE" + +#: ../src/ui_utils.c:196 +msgid "INS" +msgstr "VST" + +#: ../src/ui_utils.c:202 +msgid "TAB" +msgstr "Raz" + +#: ../src/ui_utils.c:205 +msgid "SP" +msgstr "Pre" + +#: ../src/ui_utils.c:208 +msgid "T/S" +msgstr "R/P" + +#: ../src/ui_utils.c:212 +#, c-format +msgid "mode: %s" +msgstr "način: %s" + +#: ../src/ui_utils.c:215 +#, c-format +msgid "encoding: %s %s" +msgstr "kodiranje: %s %s" + +#: ../src/ui_utils.c:221 +#, c-format +msgid "filetype: %s" +msgstr "tip datoteke: %s" + +#: ../src/ui_utils.c:225 +msgid "MOD" +msgstr "MOD" + +#: ../src/ui_utils.c:230 +#, c-format +msgid "scope: %s" +msgstr "doseg: %s" + +#: ../src/ui_utils.c:315 +#, c-format +msgid "Font updated (%s)." +msgstr "Nabor znakov osvežen (%s)." + +#: ../src/ui_utils.c:511 +msgid "C Standard Library" +msgstr "C standardna knjižnica" + +#: ../src/ui_utils.c:512 +msgid "ISO C99" +msgstr "ISO C99" + +#: ../src/ui_utils.c:513 +msgid "C++ (C Standard Library)" +msgstr "C++ (C standardna knjižnica)" + +#: ../src/ui_utils.c:514 +msgid "C++ Standard Library" +msgstr "C++ standardna knjižnica" + +#: ../src/ui_utils.c:515 +msgid "C++ STL" +msgstr "C++ STL" + +#: ../src/ui_utils.c:579 +msgid "_Set Custom Date Format" +msgstr "" + +#: ../src/ui_utils.c:1644 +msgid "Select Folder" +msgstr "Izberite mapo" + +#: ../src/ui_utils.c:1644 +msgid "Select File" +msgstr "Izberite datoteko" + +#: ../src/ui_utils.c:1767 +msgid "C_onfiguration Files" +msgstr "_Nastavitvene datoteke" + +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Shrani vse" + +#: ../src/ui_utils.c:1786 +msgid "Close All" +msgstr "Zapri vse" + +#: ../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 "Terminal" + +#: ../src/vte.c:548 +msgid "_Set Path From Document" +msgstr "_Nastavi pot iz dokumenta" + +#: ../src/vte.c:553 +msgid "_Restart Terminal" +msgstr "_Ponovno zaženi terminal" + +#: ../src/vte.c:576 +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:750 +msgid "Sets the font for the terminal widget" +msgstr "Nastavi nabor znakov v terminalskem gradniku" + +#: ../src/vte.c:752 +msgid "Foreground color:" +msgstr "Barva ospredja:" + +#: ../src/vte.c:758 +msgid "Background color:" +msgstr "Barva ozadja:" + +#: ../src/vte.c:768 +msgid "Sets the foreground color of the text in the terminal widget" +msgstr "Nastavi barvo ospredja besedilu v terminalskem gradniku" + +#: ../src/vte.c:775 +msgid "Sets the background color of the text in the terminal widget" +msgstr "Nastavi barvo ozadja besedilu v terminalskem gradniku" + +#: ../src/vte.c:778 +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:794 +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:819 +msgid "Scroll on keystroke" +msgstr "Pomakni ob pritisku na tipko" + +#: ../src/vte.c:820 +msgid "Whether to scroll to the bottom if a key was pressed" +msgstr "Ali naj se pomakne izpis do dna, ko je pritisnjena tipka" + +#: ../src/vte.c:823 +msgid "Scroll on output" +msgstr "Pomakni na izhodu" + +#: ../src/vte.c:824 +msgid "Whether to scroll to the bottom when output is generated" +msgstr "Ali naj se izpis pomakne navzdol, ko se ustvari izhod" + +#: ../src/vte.c:827 +msgid "Cursor blinks" +msgstr "Utripanje kazalke" + +#: ../src/vte.c:828 +msgid "Whether to blink the cursor" +msgstr "Ali naj kazalka utripa ali ne?" + +#: ../src/vte.c:831 +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:836 +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:840 ../plugins/filebrowser.c:1122 +msgid "Follow the path of the current file" +msgstr "Sledi poti trenutne datoteke" + +#: ../src/vte.c:841 +msgid "Whether to execute \"cd $path\" when you switch between opened files" +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 +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:850 +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/win32.c:135 +msgid "Geany project files" +msgstr "Geany projektne datoteke" + +#: ../src/win32.c:141 +msgid "Executables" +msgstr "Izvajalne datoteke" + +#: ../plugins/classbuilder.c:37 +msgid "Class Builder" +msgstr "Graditelj razredov" + +#: ../plugins/classbuilder.c:37 +msgid "Creates source files for new class types." +msgstr "Ustvari izvorno kodo za nove tipe razredov." + +#: ../plugins/classbuilder.c:322 +msgid "Create Class" +msgstr "Ustvari razred" + +#: ../plugins/classbuilder.c:332 +msgid "Class" +msgstr "Razred" + +#: ../plugins/classbuilder.c:341 +msgid "Class name:" +msgstr "Ime razreda:" + +#: ../plugins/classbuilder.c:352 +msgid "Header file:" +msgstr "Zaglavna datoteka:" + +#: ../plugins/classbuilder.c:361 +msgid "Source file:" +msgstr "Datoteka izvorne kode:" + +#: ../plugins/classbuilder.c:367 +msgid "Inheritance" +msgstr "Dedovanje" + +#: ../plugins/classbuilder.c:376 +msgid "Base class:" +msgstr "Osnovni razred:" + +#: ../plugins/classbuilder.c:389 +msgid "Base header:" +msgstr "Osnovno zaglavje:" + +#: ../plugins/classbuilder.c:397 +msgid "Global" +msgstr "Splošno" + +#: ../plugins/classbuilder.c:406 +msgid "Base GType:" +msgstr "Osnovni GType:" + +#: ../plugins/classbuilder.c:414 +msgid "Options" +msgstr "Možnosti" + +#: ../plugins/classbuilder.c:423 +msgid "Create constructor" +msgstr "Ustvari konstruktor" + +#: ../plugins/classbuilder.c:427 +msgid "Create destructor" +msgstr "Ustvari destruktor" + +#: ../plugins/classbuilder.c:437 +msgid "GTK+ constructor type" +msgstr "GTK+ tip konstruktorja" + +#: ../plugins/classbuilder.c:744 +msgid "Create Cla_ss" +msgstr "Ustvari ra_zred" + +#: ../plugins/classbuilder.c:750 +msgid "_C++ Class" +msgstr "_C++ razred" + +#: ../plugins/classbuilder.c:753 +msgid "_GTK+ Class" +msgstr "_GTK+ razred" + +#: ../plugins/htmlchars.c:38 +msgid "HTML Characters" +msgstr "HTML znaki" + +#: ../plugins/htmlchars.c:38 +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/splitwindow.c:37 +msgid "The Geany developer team" +msgstr "Geany razvojna ekipa" + +#: ../plugins/htmlchars.c:72 +msgid "HTML characters" +msgstr "HTML znaki" + +#: ../plugins/htmlchars.c:78 +msgid "ISO 8859-1 characters" +msgstr "Znaki ISO 8859-1" + +#: ../plugins/htmlchars.c:176 +msgid "Greek characters" +msgstr "Grški znaki" + +#: ../plugins/htmlchars.c:231 +msgid "Mathematical characters" +msgstr "Matematični znaki" + +#: ../plugins/htmlchars.c:272 +msgid "Technical characters" +msgstr "Tehnični znaki" + +#: ../plugins/htmlchars.c:280 +msgid "Arrow characters" +msgstr "Puščični znaki" + +#: ../plugins/htmlchars.c:293 +msgid "Punctuation characters" +msgstr "Ločila" + +#: ../plugins/htmlchars.c:309 +msgid "Miscellaneous characters" +msgstr "Razni drugi znaki" + +#: ../plugins/htmlchars.c:447 +msgid "Special Characters" +msgstr "Posebni znaki" + +#: ../plugins/htmlchars.c:449 +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:472 +msgid "Character" +msgstr "Znak" + +#: ../plugins/htmlchars.c:478 +msgid "HTML (name)" +msgstr "HTML (ime)" + +#: ../plugins/htmlchars.c:678 +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 +msgid "HTML Replacement" +msgstr "HTML zamenjave" + +#: ../plugins/htmlchars.c:697 +msgid "_HTMLToggle" +msgstr "_HTMLpreklop" + +#: ../plugins/htmlchars.c:706 +msgid "Bulk replacement of special chars" +msgstr "Masovna zamenjava posebnih znakov" + +#: ../plugins/htmlchars.c:721 +msgid "Insert Special HTML Characters" +msgstr "Vstavi posebne HTML znake" + +#: ../plugins/htmlchars.c:724 +msgid "Replace special characters" +msgstr "Zamenjaj posebne znake" + +#: ../plugins/htmlchars.c:727 +msgid "Toggle plugin status" +msgstr "Preklopi stanje vstavka" + +#: ../plugins/export.c:37 +msgid "Export" +msgstr "Izvozi" + +#: ../plugins/export.c:37 +msgid "Exports the current file into different formats." +msgstr "Izvozi trenutno datoteko v različne oblike." + +#: ../plugins/export.c:166 +msgid "Export File" +msgstr "Izvozi datoteko" + +#: ../plugins/export.c:183 +msgid "_Use current zoom level" +msgstr "_Uporabi trenutno povečavo" + +# to render=osvetliti, izrisati, izpisati +#: ../plugins/export.c:185 +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 +#, c-format +msgid "Document successfully exported as '%s'." +msgstr "Dokument uspešno izvožen kot '%s'." + +#: ../plugins/export.c:269 +#, c-format +msgid "File '%s' could not be written (%s)." +msgstr "Datoteke '%s' ni mogoče zapisati (%s)." + +#: ../plugins/export.c:316 +#, 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 +msgid "_Export" +msgstr "_Izvozi" + +# HTML +#. HTML +#: ../plugins/export.c:710 +msgid "As _HTML" +msgstr "Kot _HTML" + +# LaTeX +#. LaTeX +#: ../plugins/export.c:716 +msgid "As _LaTeX" +msgstr "Kot _LaTeX" + +#: ../plugins/filebrowser.c:40 +msgid "File Browser" +msgstr "Brskalnik datotek" + +#: ../plugins/filebrowser.c:40 +msgid "Adds a file browser tab to the sidebar." +msgstr "Doda zavihek brskalnika datotek na stransko vrstico." + +#: ../plugins/filebrowser.c:323 +msgid "Too many items selected!" +msgstr "Izbranih preveč postavk!" + +#: ../plugins/filebrowser.c:399 +#, 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 +msgid "Open _externally" +msgstr "Odpri _zunanje" + +#: ../plugins/filebrowser.c:561 +msgid "_Find in Files" +msgstr "_Najdi v datotekah" + +#: ../plugins/filebrowser.c:571 +msgid "Show _Hidden Files" +msgstr "Pokaži _skrite datoteke" + +#: ../plugins/filebrowser.c:763 +msgid "Up" +msgstr "Gor" + +#: ../plugins/filebrowser.c:768 +msgid "Refresh" +msgstr "Osveži" + +#: ../plugins/filebrowser.c:773 +msgid "Home" +msgstr "Domov" + +#: ../plugins/filebrowser.c:778 +msgid "Set path from document" +msgstr "Nastavi pot iz dokumenta" + +#: ../plugins/filebrowser.c:786 +msgid "Clear the filter" +msgstr "Počisti filter" + +#: ../plugins/filebrowser.c:800 +msgid "Filter:" +msgstr "Filter:" + +#: ../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 "Mape nastavitev vstavkov ni bilo možno ustvariti." + +# ???? +#: ../plugins/filebrowser.c:1092 +msgid "External open command:" +msgstr "Zunanji ukaz za odpiranje:" + +#: ../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 "" +"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 +msgid "Show hidden files" +msgstr "Pokaži skrite datoteke" + +#: ../plugins/filebrowser.c:1113 +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:1128 +#, fuzzy +msgid "Use the project's base directory" +msgstr "Nastavi osnovni imenik projekta" + +#: ../plugins/filebrowser.c:1132 +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 +msgid "Save Actions" +msgstr "Spravi dejanja" + +#: ../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." + +#: ../plugins/saveactions.c:169 +#, c-format +msgid "Backup Copy: Directory could not be created (%s)." +msgstr "Varnostna kopija: ni mogoče ustvariti mape (%s)." + +# običajno se to ne zgodi +#. it's unlikely that this happens +#: ../plugins/saveactions.c:201 +#, c-format +msgid "Backup Copy: File could not be read (%s)." +msgstr "Varnostna kopija: datoteke ni mogoče brati (%s)." + +#: ../plugins/saveactions.c:219 +#, c-format +msgid "Backup Copy: File could not be saved (%s)." +msgstr "Varnostna kopija: datoteke ni bilo možno shraniti (%s)." + +#: ../plugins/saveactions.c:311 +#, c-format +msgid "Autosave: Saved %d file automatically." +msgid_plural "Autosave: Saved %d files automatically." +msgstr[0] "Samodejno shranjena %d datoteka." +msgstr[1] "Samodejno shranjeni %d datoteki." +msgstr[2] "Samodejno shranjenih %d datotek." +msgstr[3] "Samodejno shranjenih %d datotek." + +#. initialize the dialog +#: ../plugins/saveactions.c:380 +msgid "Select Directory" +msgstr "Izberite mapo" + +#: ../plugins/saveactions.c:463 +msgid "Backup directory does not exist or is not writable." +msgstr "Mapa varnostne kopije ne obstaja ali ni zapisljiva." + +#: ../plugins/saveactions.c:543 +msgid "Auto Save" +msgstr "Samodejno shrani" + +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 +msgid "_Enable" +msgstr "_Omogoči" + +#: ../plugins/saveactions.c:553 +msgid "Auto save _interval:" +msgstr "_Interval samodejnega shranjevanja:" + +#: ../plugins/saveactions.c:561 +msgid "seconds" +msgstr "sekund" + +#: ../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 "Shrani _trenutno datoteko" + +#: ../plugins/saveactions.c:585 +msgid "Sa_ve all open files" +msgstr "Shrani _vse odprte datoteke" + +#: ../plugins/saveactions.c:605 +msgid "Instant Save" +msgstr "Takojšnje shranjevanje" + +#: ../plugins/saveactions.c:615 +msgid "_Filetype to use for newly opened files:" +msgstr "Tip _datoteke za novo odprte datoteke:" + +#: ../plugins/saveactions.c:646 +msgid "Backup Copy" +msgstr "Varnostna kopija" + +#: ../plugins/saveactions.c:656 +msgid "_Directory to save backup files in:" +msgstr "_Mapa za shranjevanje varnostnih kopij:" + +#: ../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):" + +#: ../plugins/saveactions.c:692 +msgid "Directory _levels to include in the backup destination:" +msgstr "Koliko nivojev kopije vk_ljučiti v cilj varnostne kopije" + +#: ../plugins/splitwindow.c:36 +msgid "Split Window" +msgstr "Razdeli okno" + +#: ../plugins/splitwindow.c:36 +msgid "Splits the editor view into two windows." +msgstr "Razdeli pogled urejevalnika v dve ločeni okni" + +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Označi vsa ujemanja v trenutnem dokumentu" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 +msgid "_Unsplit" +msgstr "_Združi" + +#: ../plugins/splitwindow.c:399 +msgid "_Split Window" +msgstr "_Razdeli okno" + +#: ../plugins/splitwindow.c:407 +msgid "_Horizontally" +msgstr "_Horizontalno" + +#: ../plugins/splitwindow.c:412 +msgid "_Vertically" +msgstr "_Vertikalno" + +#: ../plugins/splitwindow.c:427 +msgid "Split Horizontally" +msgstr "Razdeli vodoravno" + +#: ../plugins/splitwindow.c:429 +msgid "Split Vertically" +msgstr "Razdeli navpično" + +#: ../plugins/splitwindow.c:431 +msgid "Unsplit" +msgstr "Združi" + +#~ msgid "Diff file" +#~ msgstr "Diff datoteka" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText datoteka" + +#~ msgid "Select _All" +#~ msgstr "Izberi _Vse" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Samodokončanje simbolov" + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "Da bodo vse spremembe v tej datoteki učinkovale boste morali ponovno " +#~ "zagnati Geany." diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/sv.po /tmp/ssBwSf4GIv/geany-0.18/po/sv.po --- geany-0.17/po/sv.po 2009-04-26 20:17:08.000000000 +0100 +++ geany-0.18/po/sv.po 2009-08-16 17:18:28.000000000 +0100 @@ -5,9 +5,9 @@ # Tony Mattsson , 2007 - 2009 msgid "" msgstr "" -"Project-Id-Version: Geany 0.17\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-26 21:08+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2009-04-26 18:32+0100\n" "Last-Translator: Tony Mattsson \n" "Language-Team: Swedish \n" @@ -31,68 +31,68 @@ msgid "Integrated Development Environment" msgstr "Integrerad utvecklingsmiljö" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Om Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Ett snabbt och lättviktigt IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Info" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Utvecklare" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "ansvarig" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "utvecklare" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "ansvarig för översättningar" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Översättare" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Tidigare översättare" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Medarbetare " -#: ../src/about.c:340 +#: ../src/about.c:342 #, 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Tack till ..." -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Licens" -#: ../src/about.c:389 +#: ../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." @@ -100,7 +100,7 @@ "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:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -109,131 +109,131 @@ "Kunde ej hitta terminalen \"%s\" (kontrollera sökvägen till terminalen i " "Inställningar)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Processen misslyckades (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (i sökväg: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Misslyckades ändra arbetssökvägen till \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Kompileringen misslyckades." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Kompileringen lyckades." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "Kompilera" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Kör Make Object" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Nästa fel" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Föregående fel" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "Justera inkluderingar och argument" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "Visa DVI-fil" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "Visa PDF-fil" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "Ange argument" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Ange argument" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Skapa DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Skapa PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Förhandsvisa DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Förhandsvisa PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -242,69 +242,69 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Ange inkluderingar och argument" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Anger kommandon för att bygga och köra program." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s kommandon" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Kompilera:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Bygg:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Exekvera:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Kompilera aktuell fil" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Skapa användardefinierat mål" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Skriv in användardefinierade tillval här, allt text vidarebefordras till " "Make-kommandot" -#: ../src/build.c:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Kompilera aktuell fil med Make" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Misslyckades exekvera visningsprogrammet" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Processen kunde inte stoppas (%s)" -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Inga fler byggfel." @@ -312,8 +312,8 @@ msgid "Do you really want to quit?" msgstr "Vill du verkligen avsluta?" -#: ../src/callbacks.c:469 ../src/document.c:2902 ../src/interface.c:340 -#: ../src/treeviews.c:554 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "Ladda om" @@ -326,53 +326,53 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Är du säker på att du vill ladda om '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Gå till rad" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Skriv in radnumret till den rad du vill gå till" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "Använd användardefinierat datumformat" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Användardefinierat datumformat" -#: ../src/callbacks.c:1495 +#: ../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." @@ -380,24 +380,24 @@ "Skriv in användardefinierat datum- och tidsformat. Du kan använda den syntax " "som specificeras av ANSI C:s strftime funktion." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Inga fler meddelanden." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Öppna fil" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "Visa" -#: ../src/dialogs.c:150 +#: ../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." @@ -405,28 +405,28 @@ "Öppnar filen i skrivskyddat läge. Om du väljer fler filer, kommer alla " "öppnas i skrivskyddat läge." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Upptäck från filändelse" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Upptäck från fil" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "Mer inställningar" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Visa gömda filer" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Välj teckenkodning:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -441,11 +441,11 @@ "teckenkodning." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Ange filtyp:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -455,47 +455,73 @@ "Definierar filtyp, om Geany inte kan känna av filtyp automatiskt.\n" "Notera att om flera filer öppnas, kommer alla att öppnas som vald filtyp." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "Bryt" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Spara fil" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Byt namn" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Spara och byt namn på filen." -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "Öppna filen i en ny flik" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 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:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Fel" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Fråga" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Varning" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Information" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "Spara _inte" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Filen '%s' är inte sparad." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Vill du spara innan du stänger?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Välj font" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -503,106 +529,106 @@ "Ett fel inträffade, eller så kunde inte fil-informationen hämtas (exempelvis " "från en ny fil)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1668 ../src/symbols.c:1689 ../src/symbols.c:1741 -#: ../src/ui_utils.c:222 +#: ../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 "okänd" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Egenskaper" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Typ:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Storlek:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Plats:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Endast läsbar:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(endast inom Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Kodning:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(med BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(utan BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Modifierad:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Ändrad:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Skapad:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Behörighet:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Läs:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Skriv:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Ägare:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Grupp:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Annat:" -#: ../src/document.c:678 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Fil %s är stängd." -#: ../src/document.c:795 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Den nya filen \"%s\" är öppnad." -#: ../src/document.c:968 ../src/document.c:1474 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Kunde inte öppna fil %s (%s)" -#: ../src/document.c:998 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -617,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:1024 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Filen \"%s\" är ogiltig %s." -#: ../src/document.c:1034 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -630,48 +656,51 @@ msgstr "" "Filen \"%s\" verkar inte vara en textfil, eller stöds inte textkodningen." -#: ../src/document.c:1172 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Mellanslag" -#: ../src/document.c:1175 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Tabulatorer" -#: ../src/document.c:1178 +#: ../src/document.c:1128 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:1183 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Inställning %s indragsinställning för %s" -#: ../src/document.c:1236 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Ogiltigt filnamn" -#: ../src/document.c:1356 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Fil %s laddades om" -#: ../src/document.c:1358 +#. 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 "Filen %s är öppnad (%d%s)." -#: ../src/document.c:1360 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", skrivskyddad" -#: ../src/document.c:1565 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Filen kunde ej döpas om." -#: ../src/document.c:1640 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -680,7 +709,7 @@ "Ett fel inträffade medan filen konverterades från UTF-8 vid \"%s\". Filen " "sparades inte." -#: ../src/document.c:1662 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -689,52 +718,52 @@ "Felmeddelande: %s\n" "Felet inträffade vid \"%s\" (rad: %d, kolumn: %d)." -#: ../src/document.c:1667 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Felmeddelande: %s" -#: ../src/document.c:1767 ../src/document.c:1827 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Filen kunde ej sparas." -#: ../src/document.c:1826 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "(%s) kunde ej sparas" -#: ../src/document.c:1851 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Fil %s sparad." -#: ../src/document.c:1917 ../src/document.c:1974 ../src/document.c:1982 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" kunde ej hittas." -#: ../src/document.c:1982 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Vill du fortsätta sökningen från början av dokumentet?" -#: ../src/document.c:2061 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Inga träffar hittades för \"%s\"." -#: ../src/document.c:2072 ../src/document.c:2081 +#: ../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: ersatt %d förekomst av \"%s\" med \"%s\"." msgstr[1] "%s: ersatt %d förekomster av \"%s\" med \"%s\"." -#: ../src/document.c:2903 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Vill du ladda om det?" -#: ../src/document.c:2904 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -743,32 +772,20 @@ "Filen '%s' på disken är nyare än\n" "uvarande i editorn." -#: ../src/document.c:2925 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Vill du försöka spara om filen?" -#: ../src/document.c:2926 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Filen \"%s\" kunde ej hittas." -#: ../src/editor.c:3859 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3860 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3861 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3985 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Ange Tab-bredd:" -#: ../src/editor.c:3986 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "Ange antalet mellanslag som skall ersätta en tab." @@ -869,133 +886,122 @@ msgstr "Kinesisk traditionell" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japansk" -#: ../src/encodings.c:141 ../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 "Koreansk" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Utan kodning" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "Västeuropeisk" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "Östeuropeisk" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Östasiatisk" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "SV & SÖ Asiatisk" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "Mellanösternsk" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Inget" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s källfil" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "%s källfil" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Inget" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Shell script källkodsfil" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML dokument" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL dumpfil" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff-fil" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Config-fil" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext översättningsfil" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s skriptfil" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStructuredText fil" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Programmeringsspråk" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Skriptspråk" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Märkningsspråk" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Diverse språk" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "All källkod" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Alla filer" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Felaktig rexex för filtypen %s: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "odöpt" @@ -1009,8 +1015,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "osynlig" @@ -1018,7 +1024,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Öppna vald fil" @@ -1038,11 +1044,11 @@ msgid "Page Set_up" msgstr "Sidinställningar" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Stäng andra dokument" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Stäng alla" @@ -1050,83 +1056,79 @@ msgid "_Edit" msgstr "Redigera" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Markera allt" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "Format" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Ändra mellan gemener och versaler" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "Kommentera rader" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Avkommentera rader" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Stäng av / på radkommentarer" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "Gör en kopia av raden eller markeringen" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Öka indrag" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Minska indrag" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "Skicka markeringen till terminalen" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "Skicka markering till" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Infoga kommentarer" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Infoga ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Infoga filhuvud" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Infoga funktionsbeskrivning" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Infoga flerradskommentar" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Infoga en GPL-beskrivning" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Infoga en BSD-beskrivning" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Infoga datum" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Infoga \"include <...>\"" @@ -1150,7 +1152,7 @@ msgid "Find in F_iles" msgstr "Sök i filer" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Ersätt" @@ -1170,7 +1172,7 @@ msgid "Pr_evious Message" msgstr "Föregående meddelande" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Gå till rad" @@ -1198,7 +1200,7 @@ msgid "Show Side_bar" msgstr "Visa sidofält" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Editor" @@ -1242,15 +1244,15 @@ msgid "In_dent Type" msgstr "Indragstyp" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "Tabulatorer" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "Mellanslag" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "Tab och mellanslag" @@ -1370,7 +1372,7 @@ msgid "_Debug Messages" msgstr "Debugmeddelanden" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Symboler" @@ -1394,71 +1396,77 @@ msgid "Scribble" msgstr "Klotterplank" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Bilder och text" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Endast bilder" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Endast text" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Stora ikoner" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Små ikoner" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "Mycket små ikoner" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" msgstr "Göm verktygsfält" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "Göm verktygsfält" + +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Visa användning" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Visa dokumentets användning" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Gå till Tagg-definition" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Gå till Tagg-deklaration" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Snabbmenyhändelse" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Inställningar" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Ladda filerna från förra sessionen" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Öppnar filerna från förra sessionen vid start" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Ladda stöd för virtuell terminal" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1466,39 +1474,39 @@ "Huruvida den virtuella terminalemuleringen (VTE) skall laddas vid start. " "Välj bort om du ej behöver den." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Aktivera stöd för tillägg" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Vid start" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Spara fönsterplacering och storlek" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Bekräfta avslut" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Begär bekräftelse vid avslut." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Vid avslut" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Sökväg vid start:" -#: ../src/interface.c:2758 +#: ../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." @@ -1507,19 +1515,19 @@ "absolut sökväg. Lämna blankt för att automatiskt välja filens nuvarande " "sökväg." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Projektfiler:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Sökväg att starta i när projektfiler öppnas" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Extra sökväg för insticksmoduler:" -#: ../src/interface.c:2808 +#: ../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 " @@ -1530,30 +1538,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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Sökvägar" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Programstart" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Pip vid fel och när kompilering har avslutats" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 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:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Byt till statusmeddelandelistan när ett nytt meddelande visas" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1561,11 +1569,11 @@ "Huruvida Geany skall byta till statusmeddelandefönstret (vid botten) om ett " "nytt statusmeddelande kommer." -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Undertryck statusmeddelanden i statusfältet" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1573,26 +1581,27 @@ "Tar bort alla meddelanden från statusfältet. Meddelanden visas fortförande i " "fönstret för statusmeddelanden." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokusera gränssnittskomponenter (fokus följer musen)" -#: ../src/interface.c:2866 +#: ../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 "Ger automatiskt fokus till gränssnittskomponenter under muspekaren." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Övrigt" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 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:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1600,11 +1609,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:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "Använd ordet under muspekaren i vid Sök" -#: ../src/interface.c:2896 +#: ../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" @@ -1612,19 +1621,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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Sök" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Använd projektbaserade sessionsfiler" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1632,11 +1641,11 @@ "Huruvida projektets sessionsfiler skall sparas för att senare öppna den när " "projektet åter öppnas" -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Lagra projektfiler i projektets basmapp" -#: ../src/interface.c:2929 +#: ../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 " @@ -1647,75 +1656,75 @@ "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:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projekt" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Övrigt" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Generellt" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Visa symbollista" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Stäng av / på symbollistan" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Visa listan för öppna filer" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Stäng av / på listan med öppna filer" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Sidofält" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Symbollista:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Meddelandefönster:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Justerar teckensnittet för meddelandefönstret" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Justerar teckensnittet för symbollistan" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Anger texteditorns teckensnitt" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Teckensnitt" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Visa editorns flikar" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Visa knappar för stängning" -#: ../src/interface.c:3064 +#: ../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)" @@ -1723,106 +1732,111 @@ "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:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Placering av nya filflikar:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Vänster" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Höger" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Dubbelklick gömmer alla övriga gränssnittskomponenter" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Kör Visa -> Visa / göm verktygsfält-kommandot" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Editorns flikar" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Topp" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Botten" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Sidofält:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Tab positioner" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Visa statusfält" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Gränssnitt" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Visa verktygsfält" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "Lägg till verktygsfältet till menyn" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 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:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Verktygsfält" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Ikonstil" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Ikonstorlek" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Utseende" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Visa verktygsfält" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Verktygsfält" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Radbrytning" -#: ../src/interface.c:3349 +#: ../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 " @@ -1832,11 +1846,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:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Aktivera \"smart\" home-tangent" -#: ../src/interface.c:3354 +#: ../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 " @@ -1849,31 +1863,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:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Avaktivera drag-och-släpp" -#: ../src/interface.c:3359 +#: ../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 "Avaktivera drag-och-släpp i editor-fönstret" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Aktivera ihopvikning" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 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:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Vik upp alla vid uppvikningspunkten" -#: ../src/interface.c:3369 +#: ../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." @@ -1881,11 +1895,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:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Använd indikatorer för att visa kompileringsfel" -#: ../src/interface.c:3374 +#: ../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" @@ -1893,24 +1907,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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Ta bort överflödiga mellanslag efter nyradstecken" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Kolumn för radbrytning:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Stäng av / på kommentarmarkör:" -#: ../src/interface.c:3406 +#: ../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." @@ -1918,66 +1932,66 @@ "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:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Kännetecken" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Kännetecken" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Automatiskt indrag:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Grundläggande" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Nuvarande tecken" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Matcha klamrar" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Typ:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Bredd:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "Bredd, i antal tecken, på ett indrag" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Använd mellanslag vid infogande av indrag" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Använd en tab per indrag" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" "Använd mellanslag om det totala indraget är mindre än tab-bredden -- i annat " "fall, använd båda" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Hårdtab-bredd:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -1985,30 +1999,30 @@ "Huruvida indragstyp skall hittas automatiskt via filens innehåll när den " "öppnats." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Tab-tangentens indrag" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Indrag" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Indrag" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Komplettera textfragment" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2016,19 +2030,20 @@ "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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "Komplettera XML-taggar automatiskt" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "Autokomplettera XML- och HTMK-taggar" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Automatisk fortsättning på multiradskommentarer." -#: ../src/interface.c:3591 +#: ../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" @@ -2036,11 +2051,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:3593 -msgid "Automatic symbol completion" -msgstr "Komplettera symboler automatiskt" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2048,94 +2063,106 @@ "Autokomplettera kända symboler i öppna filer (funktionsnamn, globala " "variabler etc.)" -#: ../src/interface.c:3604 +#: ../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 "Max antal symbolnamnsförslag:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Komplettering listhöjd:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Tecken att skriva för komplettering:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 +#, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"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." -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +#, fuzzy +msgid "Display height in rows for the autocompletion list" msgstr "Antal rader att visa i autokompletteringslistan." -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +#, fuzzy +msgid "Maximum number of entries to display in the autocompletion list" msgstr "Maximalt antal rader att visa i autokompletteringslistan." -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Komplettering" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Parantes ()" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Stäng paranteser automatiskt" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Enkla citeringstecken ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 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:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Klammerparanteser { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 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:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Fyrkantig parantes [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 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:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Dubbla citationstecken \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 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:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Stäng citeringar och hakparanteser automatiskt" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Komplettering" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Invertera syntaxfärgningen" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2143,43 +2170,43 @@ "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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Visa indragsmarkörer" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Visa tomrum" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markera mellanslag med prickar och tabbar med pilar." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Visa radslut" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Visa radslutstecknet" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Visa radnummer" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Visar eller gömmer radnummer-marginalen" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Visa marginalmarkörer" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2187,38 +2214,38 @@ "Visar eller gömmer den lilla marginalen till höger om radnummren som används " "för att markera rader." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Sluta rulla vid sista raden" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Visa" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Markör för lång rad" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Färg på markören för lång rad" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 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:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Färgväljare" -#: ../src/interface.c:3826 +#: ../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 " @@ -2228,22 +2255,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:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Rad" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 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:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Bakgrund" -#: ../src/interface.c:3846 +#: ../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 " @@ -2252,55 +2279,55 @@ "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:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Avaktiverad" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Markör för lång rad" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Visa" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Öppna nya dokument från kommandotolken" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Förvalt radslutstecken:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Nya filer" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Förvald kodning (nya filer):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Förvald teckenkodning (existerande filer):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Använd fast kodning när filer öppnas" -#: ../src/interface.c:3978 +#: ../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 " @@ -2310,55 +2337,55 @@ "öppnas, och använder i stället en specificerad kodning (behövs vanligen " "inte)." -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Teckenkod" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Skriv alltid nyradstecken i slutet av filen" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Ta bort överflödiga mellanslag och tab-tecken" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Ersätt tab-tecken med mellanslag" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 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:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Sparar filer" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Senaste längd på fil-listan:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Disk timeout-kontroll:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2366,27 +2393,27 @@ "Hur ofta kontroller utförs för att se om dokumentet ändrats, i antalet " "sekunder. Noll stänger av kontroller." -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1019 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Filer" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Webbläsare:" -#: ../src/interface.c:4138 +#: ../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:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2394,23 +2421,23 @@ "En terminal som Xterm, Gnome-terminal eller Konsole (måste acceptera -e " "argumentet)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Sökväg (och eventuella argument) till din favoritwebbläsare." -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Sökvägar till verktyg" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Snabbmenyhändelse:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2420,67 +2447,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:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Kommandon" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Verktyg" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "emailadressen till utvecklaren" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Utvecklarens initialer" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Inledande version:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Versionnummret som filen börjar med" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Företagets namn" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Utvecklare:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Företag:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "E-post:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Initialer:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Utvecklarens namn" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "År:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Datum och tid:" -#: ../src/interface.c:4382 +#: ../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." @@ -2488,7 +2515,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:4389 +#: ../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." @@ -2496,7 +2523,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:4396 +#: ../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." @@ -2504,62 +2531,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:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Mall-data" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Mallar" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "Ändra" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Tangentbordsgenvägar" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Genvägar" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Kommando:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Använd ett externt kommando för att skriva ut" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Visa radnummer" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Lägg till radnummer vid utskrift" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Skriv ut sidnummer" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "Lägg till sidnummer i sidfoten. Detta upptar två rader på sidan." -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Skriv ut filhuvud" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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." @@ -2567,19 +2594,19 @@ "Lägger till tre rader i sidhuvudet som visar sidnummer, filnamn och datum. " "Detta upptar tre rader på sidan." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Använd den utskrivna filens basnamn" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" msgstr "Skriv bara ut filnamnet, ej sökvägen." -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Datumformat:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2589,535 +2616,554 @@ "sidhuvudet. Du kan använda den syntax som specificeras av ANSI C:s strftime " "funktion." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Använd GTKs utskriftshantering" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Utskrift" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Projektegenskaper" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Fil" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Ny" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Öppna" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Öppna vald fil" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Spara" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Spara som" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Spara allt" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Skriv ut" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Stäng" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Stäng allt" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Ladda om fil" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Projekt" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Projektets egenskaper" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Ångra" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Gör om" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Duplicera raden eller markeringen" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Radera rad(er)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "Radera rad(er)" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "Förflytta raden" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Flytta till vald rad" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Flytta upp en rad" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Flytta ned en rad" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Färdigställ textfragment" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Flytta markör i textfragmentet" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Undertryck komplettering av textfragment" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Snabbmenyhändelse" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Komplettera ord" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Visa calltip" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Visa macrolistan" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Klippbord" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Klipp ut" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Kopiera" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Klistra in" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Kopiera rad(er)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Klipp ut rad(er)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Markera" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Markera allt" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Välj ord" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Välj rad(er)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Välj paragraf" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Format" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Växla mellan versaler och gemener" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Stäng av / på radkommentarer" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Kommentera rad(er)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Ta bort kommentarer från rad(er)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Öka indrag" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Minska indrag" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Öka indrag med ett blanksteg" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Minska indrag med ett blanksteg" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Smart radindrag" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Definiera användarkommando 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Definiera användarkommando 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Definiera användarkommando 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Skicka markeringen till terminalen" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Infoga" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Klistra in datum" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Infoga alternativt tomt tecken" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Inställningar" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Sök" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Sök" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Sök nästa" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Sök föregående" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Sök nästa markering" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Sök föregående markering" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Ersätt" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Sök i filer" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Nästa meddelande" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Föregående meddelande" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Visa användning" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Visa användning" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Kör Make all" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Gå till rad" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Bläddra bakåt" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Bläddra frammåt" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Gå till matchande klammer" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Stäng av / på markör" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Gå till nästa markör" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Gå till föregående markör" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Gå till Tagg-definition" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Gå till Tagg-deklaration" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Gå till början av raden" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Gå till radslut" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Gå till radslut" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Gå till föregående orddel" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Gå till nästa orddel" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Visa" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Visa / göm verktygsfält" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Helskärm" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Stäng av / på meddelandefönstret" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Stäng av / på sidofältet" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Förstora" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Förminska" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Fokusera" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Byt till editor" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Byt till Scribble" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Byt till VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Växla till sökfältet" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Växla till sidofältet" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Växla till kompilatorn" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Anteckningsblockets tab-kommandon" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Byt till det vänstra dokumentet" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Byt till det högra dokumentet" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Byt till det sist använda dokumentet" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Flytta dokumentet till vänster" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Flytta dokumentet till höger" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Flytta dokumentet först" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Flytta dokumentet sist" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Justera radbrytning (line-wrap)" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Justera radbrytning (line-break)" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Ersätt mellanslag med tab-tecken" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Justera nuvarande mapp" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Vik ihop alla" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Vik upp alla" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Ladda om symbollistan" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Bygg" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Kompilera" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Kör Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Kör Make på valbart mål" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Kör Make på objekt" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Nästa fel" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Föregående fel" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Kör" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Kör (alternativt kommando)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Bygg-inställningar" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Visa färgväljaren" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Hjälp" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Tangentgenvägar" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Följande tangentbordsgenvägar kan konfigureras:" -#: ../src/keybindings.c:1531 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Växla till dokumentet" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Kunde ej ladda en eller fler av sessionens filer" -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Debugmeddelanden" @@ -3174,8 +3220,8 @@ msgstr "Visa Geany's installationsprefix" #: ../src/main.c:141 -msgid "don't load the previous session's files" -msgstr "ladda inte förra sessionens filer" +msgid "Don't load the previous session's files" +msgstr "Ladda inte förra sessionens filer" #: ../src/main.c:143 msgid "Don't load terminal support" @@ -3189,24 +3235,24 @@ msgid "Show version and exit" msgstr "Visa version och avsluta" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[FILER...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Flytta nu?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3215,7 +3261,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3224,7 +3270,7 @@ "Mappen där inställningar lagras \"%s\" kunde inte flyttas till \"%s\" (%s). " "Du måste själv flytta mappen." -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3236,22 +3282,22 @@ "konfigureringsmapp.\n" "Starta Geany ändå?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Detta är Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigureringsmappen kunde inte skapas (%s)" -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Konfigurationsfilerna laddades om." @@ -3267,7 +3313,7 @@ msgid "_Hide Message Window" msgstr "Dölj meddelandefönster" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3276,11 +3322,11 @@ "Tillägget \"%s\" är inte binärt kompatibel med denna version av Geany. Var " "god, kompilera om modulen." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Tilläggshanteraren" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3291,23 +3337,23 @@ "Beskrivning: %s\n" "Utvecklare: %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Tillägg" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Inga tillägg är tillgängliga" -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Tillägg" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3315,36 +3361,44 @@ "Nedan ser du en lista med insticksmoduler. Välj vilka insticksmoduler som " "skall laddas när Geany startas." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Plugin egenskaper:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Händelse" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Genväg" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Läs av tangent" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "Expandera alla" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "Stäng alla" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Händelse" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Genväg" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "Bryt" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Vill du bryta tangentbindning?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" @@ -3353,20 +3407,20 @@ #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 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:1458 +#: ../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." @@ -3376,7 +3430,7 @@ "Geany." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3387,7 +3441,7 @@ "manuellt." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3396,18 +3450,8 @@ "kompilerats med GTK 2.10 eller högre och Geany körs med GTK 2.10 " "eller högre." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"För att ända innehållet i verktygsfältet, måste du redigera filen " -"'ui_toolbar.xml'. Du kan läsa instruktionerna för hur du kan redigera " -"verktygsfältet i dokumentationen för Geany." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3415,44 +3459,52 @@ "Varning: inställningarna för det aktuella projektet används. Se " "Projekt->Egenskaper." -#: ../src/printing.c:270 +#: ../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 "Sida %d av %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Dokumentinställningar" -#: ../src/printing.c:375 +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" msgstr "Skriv bara ut filnamnet, ej sökvägen." -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Sida %d av %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Utskriften av filen %s avbröts" -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Fil %s utskriven." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Utskriften \"%s\" misslyckades (felkod: %s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 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:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3463,7 +3515,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Utskriften \"%s\" misslyckades (felkod: %s)." @@ -3482,19 +3534,19 @@ msgid "C_reate" msgstr "Skapa" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Namn:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Filnamn:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Bassökväg:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3503,136 +3555,136 @@ "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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Välj projektets sökväg" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Projektfilen \"%s\" kunde inte laddas." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Öppna projekt" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Projektfiler" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Projekt \"%s\" stängt." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Beskrivning:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Kör Make i bassökvägen" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Kör kommando:" -#: ../src/project.c:457 +#: ../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 "Kommandorad att köra i projektets grundläggande sökväg." -#: ../src/project.c:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Fil-mönster:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Vill du stänga innan du fortsätter?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Projektet '%s' är redan öppnat." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Projektnamnet är för kort." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Du har valt ett ogiltigt filnamn." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Vill du skapa projektets basmapp?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Sökvägen \"%s\" existerar inte." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektets basmapp kunde inte skapas (%s)" -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektfilen kunde inte skrivas (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Projekt \"%s\" skapad." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt \"%s\" sparad." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Välj projektets filnamn" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Välj projektets körkommando" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt \"%s\" öppnad." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Använd regular expressions" -#: ../src/search.c:205 +#: ../src/search.c:220 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:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Sök bakåt" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Använd escape-sekvenser" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3640,395 +3692,405 @@ "Ersätt \\\\, \\t, \\n, \\r and \\uXXXX (Unicode tecken) med korresponderande " "specialtecken." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Gör skillnad mellan versaler och gemener" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Sök endast hela ord" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Sök från början av ord" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "Föregående" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "Nästa" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "Sök efter:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "Hitta alla" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "Markera" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Markera alla träffar i detta dokument." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "I Session" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "I dokumentet" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Stäng dialogruta" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "Avaktivera detta tillval för att hålla dialogrutan öppen." -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Sök & ersätt" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Ersätt med:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Ersätt alla" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "I markering" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Ersätt alla träffar i markerad text" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "Sökväg:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "Teckenkodning:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Fixerade strängar" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Grep Regular Expressions" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "Läs Grep's manualsida för mer information." -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "Utöka Regular Expressions" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Gå igenom undermappar" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "Invertera sökresultat" -#: ../src/search.c:782 +#: ../src/search.c:797 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:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Extra inställningar:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Andra tillval att skicka till Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "Hittat %d träff för \"%s\"." msgstr[1] "Hittat %d träffar för \"%s\"" -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Ogiltig mapp för att söka i filer." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Ingen text att söka efter." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Söker..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (i sökväg: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Kan inte öppna sökväg (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Inga träffar hittade." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Kapitel" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Sektion" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Sekt1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Sekt2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Sekt3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Appendix" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Annat" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Typ" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Typ-konstruktörer" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Funktioner" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Markeringar" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Tangenter" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Variabler" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Kommando" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Miljö" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Subsektion" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Subsubsektion" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Etikett" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Strukturer" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Paket" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Min" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Lokal" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Our" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Gränssnitt" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Klasser" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Konstanter" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Ankare" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Rubrik (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Rubrik (H1)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Rubrik (H1)" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "ID-markering" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Typ-konstruktörer" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Moduler" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Metoder" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Namespaces" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Egenskaper" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Exportera" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Medlemmar" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Etiketter" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Subrutiner" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Block" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Makron" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Definitioner" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Mål" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Namespaces" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Strukturer" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1311 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Okänd filändelse för filen \"%s\".\n" -#: ../src/symbols.c:1332 +#: ../src/symbols.c:1358 #, 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:1339 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4037,7 +4099,7 @@ "Användning: %s -g \n" "\n" -#: ../src/symbols.c:1340 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4048,167 +4110,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:1354 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Ladda taggar" -#: ../src/symbols.c:1361 +#: ../src/symbols.c:1387 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:1381 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Laddade %s tagg-filen '%s'." -#: ../src/symbols.c:1383 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Kunde inte ladda tagg-filen '%s'." -#: ../src/symbols.c:1517 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Deklarationen \"%s\" kunde inte hittas." -#: ../src/symbols.c:1519 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definitionen av \"%s\" kan inte hittas." -#: ../src/symbols.c:1810 -msgid "_Expand All" -msgstr "Expandera alla" - -#: ../src/symbols.c:1815 -msgid "_Collapse All" -msgstr "Stäng alla" - -#: ../src/symbols.c:1825 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Sortera efter namn" -#: ../src/symbols.c:1832 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Sortera efter egenskaper" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Spara fil" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Spara alla" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Spara alla öppna filer" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Ladda om filen från disk" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Stäng fil" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Stäng alla öppna filer" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Klipp ut markering" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Kopiera markering" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Klistra in innehållet från klippbordet" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Radera markering" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Ångra senaste ändring" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Gör om senaste ändring" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Kompilera aktuell fil" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Kör eller visa filen" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Förstora texten" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Förminska texten" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Minska indrag" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Öka indrag" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Sök angiven text i aktuell fil" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Gå till inskrivet radnummer." -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Visa inställningar" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Avsluta Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Skriv ut dokumentet" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "Inställningar börjar gälla efter du startat om Geany" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Markera alla träffar i detta dokument." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Skapa ny fil" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Öppna existerande fil" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Gå till" +#: ../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 "Visa" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4274,123 +4347,144 @@ msgid "Characters:" msgstr "Tecken:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Inga taggar hittade" -#: ../src/treeviews.c:491 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Visa symbollistan" -#: ../src/treeviews.c:499 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Visa dokumentlistan" -#: ../src/treeviews.c:507 ../plugins/filebrowser.c:586 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Göm sidolist" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Visa hela sökvägen" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "rad: %d\t kolumn: %d\t märkning: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "läge: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "Teckenkodning: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "filtyp: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "omfång: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Font uppdaterad (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C Standard Library" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Library)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ Standard Library" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "Ställ in användardefinierat datumformat" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Välj mapp" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Välj fil" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Konfigurationsfiler" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Spara alla" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Stäng alla" +#: ../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 "Terminal" @@ -4516,7 +4610,7 @@ "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:1125 +#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 msgid "Follow the path of the current file" msgstr "Följ filens sökväg" @@ -4551,161 +4645,145 @@ "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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geany projektfiler" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Exekverbara filer" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Fel" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Fråga" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Varning" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Information" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Klassbyggare" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Skapar källfiler för nya klasstyper." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Skapa klass" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Klass" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Klassnamn:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Header-fil:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Källfil:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Arv:" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Basklass:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Bas-header:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Bas GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Inställningar" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Skapa konstruktor" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Skapa destruktor" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+ konstruktortyp" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Skapa klass" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "C++ klass" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "GTK+ klass" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML-tecken" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Infogar HTML-tecken, som '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Geanys utvecklare" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML tecken" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 tecken" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Grekiska tecken" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Matematiska symboler" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Tekniska symboler" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Piltecken" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Punktueringstecken" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Övriga tecken" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Specialtecken" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "Infoga" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4713,164 +4791,164 @@ "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:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Tecken" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (namn)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Infoga speciella HTML-tecken" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "Ersätt HTML" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "Växla HTML" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Ersätt specialtecken" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Klistra in speciella HTML-tecken" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Ersätt specialtecken" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Stäng av / på instickmodulens status" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Exportera" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Exportera filen till olika format." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Exportera fil" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "Använd nuvarande zoom-nivå" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" "Visar dokumentets teckenstorlek tillsammans med nuvarande förstoringsnivå" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Dokumentet exporterades som '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Filen '%s' kunde inte skrivas (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "Exportera" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Som HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Som LATEX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Filhanterare" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Lägger till en filbläddrarflik i sidofältet." -#: ../plugins/filebrowser.c:329 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "För många saker markerade!" -#: ../plugins/filebrowser.c:405 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "Kunde inte exekvera konfigurerat externt kommando '%s' (%s)." -#: ../plugins/filebrowser.c:561 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Öppna externt" -#: ../plugins/filebrowser.c:567 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "Sök i filer" -#: ../plugins/filebrowser.c:577 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Visa gömda filer" -#: ../plugins/filebrowser.c:769 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Upp" -#: ../plugins/filebrowser.c:774 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Uppdatera" -#: ../plugins/filebrowser.c:779 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Hem" -#: ../plugins/filebrowser.c:784 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Ange sökväg" -#: ../plugins/filebrowser.c:792 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Rensa filtret" -#: ../plugins/filebrowser.c:806 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filter:" -#: ../plugins/filebrowser.c:1025 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Fokusera fillistan" -#: ../plugins/filebrowser.c:1027 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Fokusera sökvägen" -#: ../plugins/filebrowser.c:1070 ../plugins/saveactions.c:478 +#: ../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:1095 +#: ../plugins/filebrowser.c:1092 msgid "External open command:" msgstr "Öppna via externt kommando:" -#: ../plugins/filebrowser.c:1104 +#: ../plugins/filebrowser.c:1101 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4884,15 +4962,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:1110 +#: ../plugins/filebrowser.c:1107 msgid "Show hidden files" msgstr "Visa gömda filer" -#: ../plugins/filebrowser.c:1116 +#: ../plugins/filebrowser.c:1113 msgid "Hide object files" msgstr "Göm objektfiler" -#: ../plugins/filebrowser.c:1120 +#: ../plugins/filebrowser.c:1117 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4900,41 +4978,42 @@ "Visa inte genererade objektfiler i filläsaren, detta inkluderar *.o, *.obj. " "*.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1131 -msgid "Set the project's base directory" +#: ../plugins/filebrowser.c:1128 +#, fuzzy +msgid "Use the project's base directory" msgstr "Vill du skapa projektets basmapp?" -#: ../plugins/filebrowser.c:1135 +#: ../plugins/filebrowser.c:1132 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" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Spara \"Actions\"" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" "Denna plugin ger möjlighet till olika valmöjligheter vid sparande av filer." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Backupkopia: Filen kunde inte skapas (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Backupkopia: Filen kunde inte läsas (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Backupkopia: Filen kunde inte sparas (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4942,104 +5021,134 @@ msgstr[1] "Autospara: Sparade %d filer automatiskt." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Välj mapp" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Backup-mappen existerar inte, eller är inte skrivbar." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Spara automatiskt" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "Sätt på" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "Intervall för autosparande:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "sekunder" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "Skriv statusmeddelande om filer sparats automatiskt" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Spara endast den nu öppna filen" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Spara alla öppna filer" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Spara omedelbart" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "Filtyp att använda för nyöppnade filer:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Backup-kopia" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "Sökväg att spara backupfilerna i:" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" "Datum- och tidsformat för backupfilerna (\"man strftime\" fär mer info):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Sökvägsnivåer att inkludera i backupmålet:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Dela fönster" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Delar editor-fönstret i två delar" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Markera alla träffar i detta dokument." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "Sätt ihop" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "Dela fönster" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "Vågrätt" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "Vertikal" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Dela vågrätt" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Dela vertikalt" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "Sätt ihop" +#~ msgid "Diff file" +#~ msgstr "Diff-fil" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText fil" + +#~ msgid "Select _All" +#~ msgstr "Markera allt" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Komplettera symboler automatiskt" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "För att ända innehållet i verktygsfältet, måste du redigera filen " +#~ "'ui_toolbar.xml'. Du kan läsa instruktionerna för hur du kan redigera " +#~ "verktygsfältet i dokumentationen för Geany." + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "Inställningar börjar gälla efter du startat om Geany" + #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Kunde inte visa %s (försäkra dig om att den redan är kompilerad)" @@ -5319,9 +5428,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Strukturer och typdefinitioner" -#~ msgid "Show _Full Path Name" -#~ msgstr "Visa hela sökvägen" - #~ msgid "Terminal emulation:" #~ msgstr "Terminal emulering:" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/tr.po /tmp/ssBwSf4GIv/geany-0.18/po/tr.po --- geany-0.17/po/tr.po 2009-04-26 20:17:08.000000000 +0100 +++ geany-0.18/po/tr.po 2009-08-16 17:18:28.000000000 +0100 @@ -4,10 +4,10 @@ # Gürkan Gür 2008, 2009 msgid "" msgstr "" -"Project-Id-Version: geany 0.17svn\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-26 21:08+0200\n" -"PO-Revision-Date: 2009-04-25 23:13+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" +"PO-Revision-Date: 2009-08-07 18:27+0200\n" "Last-Translator: Gürkan Gür \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -28,67 +28,67 @@ msgid "Integrated Development Environment" msgstr "Tümleşik Geliştirme Ortamı" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Geany Hakkında" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Hızlı ve Hafif Bir IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Bilgi" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Geliştiriciler" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "bakıcı" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "geliştirici" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "çeviri bakıcısı" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Çevirmenler" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Önceki Çevirmenler" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Katkıda Bulunanlar" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Yapımcılar" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Lisans" -#: ../src/about.c:389 +#: ../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." @@ -96,7 +96,7 @@ "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:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -105,132 +105,132 @@ "\"%s\" terminali bulunamadı (Terminal aracının yolunu ayarlamak için " "Seçenekler'e bakınız)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "İşlem hatalı (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (%s dizininde)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "\"%s\" çalışma dizinine geçilemedi." -#: ../src/build.c:731 +#: ../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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Derleme hatalı." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Derleme başarılı." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Derle" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Nesne_yi Derle" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Sonra_ki Hata" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Ön_ceki Hata" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../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:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "D_VI Dosyayı İncele" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "PDF Dosyayı _İncele" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "Arg_ümanları Ayarla" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Argümanları Ayarla" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "DVI oluşturma:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "PDF oluşturma:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "DVI izleme:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "PDF izleme:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -239,68 +239,68 @@ "%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" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Dahili Seçenekleri ve Argümanları Ayarla" -#: ../src/build.c:1506 +#: ../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." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s komutları" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Derle:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "İnşa Et:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Çalıştır:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "Geçerli dosyayı derle" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Özel Hedef Belirle" -#: ../src/build.c:1927 +#: ../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:1976 +#: ../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:1979 +#: ../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:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "Geçerli dosyayı Make ile derle" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Görüntüleme programı çalıştırılamadı" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "İşlem durdurulamadı (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Başka inşa hatası yok." @@ -308,8 +308,8 @@ msgid "Do you really want to quit?" msgstr "Gerçekten çıkmak istiyor musunuz?" -#: ../src/callbacks.c:469 ../src/document.c:2902 ../src/interface.c:340 -#: ../src/treeviews.c:554 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "Tek_rar Yükle" @@ -322,54 +322,54 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Yeniden yüklemek istediğinize emin misiniz '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Satıra Git" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Gitmek istediğiniz satırı girin:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "gg.aa.yyyy" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "aa.gg.yyyy" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "yyyy/aa/gg" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "gg.aa.yyyy sa:dk:sn" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "gg.aa.yyyy sa:dk:sn" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/aa/gg sa:dk:sn" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "Özel Tarih Formatını K_ullan" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Özel Tarih Formatı" -#: ../src/callbacks.c:1495 +#: ../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." @@ -377,24 +377,24 @@ "Buraya özel tarih ve zaman biçimini girin. ANSI C uyumlu bütün olasılıkları " "kullanabilirsiniz." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Başka mesaj yok." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Dosya Aç" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "G_örünüm" -#: ../src/dialogs.c:150 +#: ../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." @@ -402,28 +402,28 @@ "Dosyayı salt okuma modunda açar. Birden fazla dosya açarsanız hepsi salt " "okunur modda açılacaktır." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Dosya uzantısına göre algıla" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Dosyadan algıla" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "_Daha fazla seçenek" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "_Gizli dosyaları görüntüle" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Kodlamayı ayarla:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -436,11 +436,11 @@ "Birden çok dosya seçerseniz hepsi seçilen kodlama ile açılacaktır." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Dosya türünü ayarla:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -452,23 +452,31 @@ "kullanın.\n" "Birden çok dosya seçerseniz hepsi seçilen dosya türünde açılacaktır." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "Üzerine yazılsın mı?" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "Dosya adı mevcut!" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Dosyayı Kaydet" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Y_eniden adlandır" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Dosyayı kaydet ve yeniden isimlendir" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "D_osyayı yeni sekmede aç" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -476,129 +484,146 @@ "Şimdiki kaydedilmemiş dökümanı açık tut ve yeni kaydedilmiş dosyayı yeni " "sekmede aç." -#: ../src/dialogs.c:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Hata" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Soru" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Uyarı" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Bilgi" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "Kay_detme" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "'%s' dosyası kaydedilmedi." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Kapatmadan önce kaydetmek ister misiniz?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Yazıtipi seç" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 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:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1668 ../src/symbols.c:1689 ../src/symbols.c:1741 -#: ../src/ui_utils.c:222 +#: ../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 "bilinmeyen" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Özellikler" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Tür:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Boyut:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Yer:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Salt okunur:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(sadece Geany içinde)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Kodlama:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(BOM ile)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(BOM olmadan)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Düzenlendi:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Değiştirildi:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Ulaşıldı:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "İzinler:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Okuma:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Yazma:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Sahibi:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Grup:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Diğer:" -#: ../src/document.c:678 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "%s dosyası kapatıldı." -#: ../src/document.c:795 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Yeni dosya \"%s\" açıldı." -#: ../src/document.c:968 ../src/document.c:1474 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "%s dosyası açılamadı (%s)" -#: ../src/document.c:998 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -613,12 +638,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1024 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "\"%s\" dosyası geçerli değil %s." -#: ../src/document.c:1034 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -627,48 +652,51 @@ "\"%s\" dosyası bit yazı dosyası gibi görünmüyor, belki de kodlaması " "desteklenmiyor." -#: ../src/document.c:1172 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Boşluklar" -#: ../src/document.c:1175 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Sekmeler" -#: ../src/document.c:1178 +#: ../src/document.c:1128 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:1183 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "%s girdileme yöntemi %s için ayarlanıyor." -#: ../src/document.c:1236 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Geçersiz dosya adı" -#: ../src/document.c:1356 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "%s dosyası yeniden yüklendi." -#: ../src/document.c:1358 +#. 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 "%s dosyası açıldı(%d%s)." -#: ../src/document.c:1360 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", salt okunur" -#: ../src/document.c:1565 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "Dosya isimlendirmesinde hata." -#: ../src/document.c:1640 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -677,7 +705,7 @@ "Dosyayı UTF-8'den \"%s\" kodlamasına çevirirken hata oluştu. Dosya " "kaydedilmeden bırakıldı." -#: ../src/document.c:1662 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -686,52 +714,52 @@ "Hata mesajı: %s\n" "Hatanın oluştuğu yer \"%s\" (satır: %d, sütun: %d)." -#: ../src/document.c:1667 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Hata mesajı: %s." -#: ../src/document.c:1767 ../src/document.c:1827 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Dosya kaydetmede hata" -#: ../src/document.c:1826 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Dosya kaydetmede hata (%s)." -#: ../src/document.c:1851 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "%s dosyası kaydedildi." -#: ../src/document.c:1917 ../src/document.c:1974 ../src/document.c:1982 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" bulunamadı." -#: ../src/document.c:1982 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Aramayı geç ve tekrar bul?" -#: ../src/document.c:2061 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "\"%s\" araması için hiçbir eşleşme bulunamadı." -#: ../src/document.c:2072 ../src/document.c:2081 +#: ../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: %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:2903 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Yeniden yüklemek ister misiniz?" -#: ../src/document.c:2904 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -740,32 +768,20 @@ "'%s' dosyasının daha güncel bir hali\n" "diskte bulunmakta." -#: ../src/document.c:2925 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Dosyayı tekrar kurtarmayı denemek ister misiniz?" -#: ../src/document.c:2926 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "\"%s\" dosyası diskte bulunamadı!" -#: ../src/editor.c:3859 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3860 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3861 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3985 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Tab genişliğini girin" -#: ../src/editor.c:3986 +#: ../src/editor.c:4289 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." @@ -867,133 +883,122 @@ msgstr "Geleneksel Çince" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Japonca" -#: ../src/encodings.c:141 ../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" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Kodlamasız" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Batı Avrupa" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Doğu Avrupa" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Doğu _Asya" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_GD & GB Asya" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Orta Asya" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Hiçbiri" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s kaynak dosyası" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, c-format +msgid "%s file" +msgstr "%s dosya" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Hiçbiri" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Kabuk betiği dosyası" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML dosyası" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "CSS dosyası" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL Dump dosyası" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff dosyası" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Ayar dosyası" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext çeviri dosyası" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s betik dosyası" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "reStructuredText dosyası" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "_Programlama Dilleri" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "_Betik Dilleri" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "İşaretle_me Dilleri" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "D_iğer Diller" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Bütün Kaynak" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Tüm dosyalar" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, 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:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "isimsiz" @@ -1007,8 +1012,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "geçersiz" @@ -1016,7 +1021,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Seç_ilen Dosyayı Aç" @@ -1036,11 +1041,11 @@ msgid "Page Set_up" msgstr "Sayfa D_üzeni" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Di_ğer Dosyaları Kapat" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Tümü_nü Kapat" @@ -1048,83 +1053,79 @@ msgid "_Edit" msgstr "Düz_enle" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Tümünü Se_ç" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Biçim" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Seçimi Büyült/Kü_çült" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "Satırları _Yoruma Çevir" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Satırların Yorumunu _Kaldır" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Sa_tırı Yorum Yap/Yapma" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "Girintiyi _Artır" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Girintiyi A_zalt" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "_Seçimi Terminale Gönder" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Seçimi yolla" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Yoru_m Ekle" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "Değişiklik _Girdisi Ekle" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Dosya _Başlığı Ekle" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "_Fonksiyon Tanımı Gir" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Çok satırlı yo_rum girer" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "_GPL Lisans Notu Gir" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "_BSD Lisans Notu Gir" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Tari_h Gir" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" g_ir" @@ -1148,7 +1149,7 @@ msgid "Find in F_iles" msgstr "Dosyalar _içinde Bul" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Değişti_r" @@ -1168,7 +1169,7 @@ msgid "Pr_evious Message" msgstr "Önc_eki Mesaj" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Satıra _Git" @@ -1196,7 +1197,7 @@ msgid "Show Side_bar" msgstr "Yan Pane_li Gçster" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Düzenleyici" @@ -1240,15 +1241,15 @@ msgid "In_dent Type" msgstr "Girintileme T_ürü" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "S_ekmeler" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "Bo_şluklar" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "_Sekmeler ve Boşluklar" @@ -1368,7 +1369,7 @@ msgid "_Debug Messages" msgstr "Hata Mesa_jları" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Semboller" @@ -1392,71 +1393,75 @@ msgid "Scribble" msgstr "Karalama" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Resimler ve Y_azı" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "Sadece Res_imler" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Sadece Ya_zı" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Geniş Simge_ler" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Küçük _Simgeler" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "_Çok Küçük Simgeler" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" -msgstr "Araç çubu_ğunu gizle" +#: ../src/interface.c:1769 +msgid "_Customize Toolbar" +msgstr "Araç Çubuğunu _Özelleştir" + +#: ../src/interface.c:1777 +msgid "_Hide Toolbar" +msgstr "A_raç çubuğunu gizle" -#: ../src/interface.c:2082 +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "K_ullanım Bul" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "_Döküman Kullanımı Bul" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "Etiket _Tanımına Git" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Etik_et İlanına Git" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Ba_ğlam Görevi" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Seçenekler" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Önceki oturumdan dosyaları yükle" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "Açılışta önceki oturumdan kalan dosyaları yükler" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Sanal terminal desteğini yükle" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1464,40 +1469,40 @@ "Sanal terminal desteği (VTE) açılışta yüklenmiş olmalı. İhtiyacınız yoksa " "etkisizleştirin." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Eklenti desteğini yükle" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Başlangıç" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Pencere yeri ve boyutunu kaydet" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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." -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Çıkışta Onay İste" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "Çıkışta bir onay sorusu sorar" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Kapatma" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Başlangıç yolu:" -#: ../src/interface.c:2758 +#: ../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." @@ -1505,19 +1510,19 @@ "Bir dosya açılırken veya kaydedilirken öntanımlı yol. Çalışma dizininde " "kalması için boş bırakın." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Proje dosyaları:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Proje dosyaları açılırken açılacak yol" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "Harici eklenti yolu:" -#: ../src/interface.c:2808 +#: ../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 " @@ -1527,29 +1532,29 @@ "izler. Buraya girdiğiniz yol da harici eklentilerin aranacağı dizin " "olacaktır. Kullanmak istemiyorsanız boş bırakın." -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Yollar" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Başlangıç" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Hatalarda veya başarılı derleme sonlarında sesle uyar" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 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:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Yeni mesaj oluştuğunda durum mesajları listesine gönder" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1557,11 +1562,11 @@ "Yeni mesaj oluştuğunda durum mesajları sekmesine (not defteri penceresinin " "en altında) gönder" -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Durum çubuğunda mesaj gösterme" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1569,11 +1574,11 @@ "Durum çubuğunda mesaj göstermez. Ancak mesajlar durum penceresinde görünmeye " "devam eder." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Bölümleri otomatik odakla (odak fareyi takip eder)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1582,15 +1587,15 @@ "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:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Çeşitli" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "Arama diyaloğu penceresini her zaman gizle" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1598,11 +1603,11 @@ "Sonraki veya önceki sonuç için tıklama yapıldığında her zaman ilk sonuca " "ulaşıp arama diyaloğunu kapat" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 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:2896 +#: ../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" @@ -1610,29 +1615,29 @@ "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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Arama" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Proje tabanlı oturum dosyalarını kullan" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "Proje dosyasını projenin temel dizininde sakla" -#: ../src/interface.c:2929 +#: ../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 " @@ -1643,75 +1648,75 @@ "yerine, proje klasörünün içinde saklanır. İsterseniz proje yolunu Yeni Proje " "penceresinden değiştirebilirsiniz." -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Projeler" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Çeşitli" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Genel" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Sembol listesini göster" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Sembol listesini aç ya da kapat" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Döküman listesini göster" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Döküman listesini aç ya da kapat" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Yan panel" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Sembol listesi:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Mesaj penceresi:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Editör:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Mesaj penceresi için yazıtipini seçin" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Sembol listesi için yazıtipini seçin" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Düzenleyici için yazıtipini seçin" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Yazıtipi" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Düzenleyici sekmelerini göster" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Kapat tuşlarını göster" -#: ../src/interface.c:3064 +#: ../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)" @@ -1719,105 +1724,109 @@ "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:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Yeni dosya sekmelerinin yerleşimi:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Sol" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "Yeni dosyalar not defterinde sola yerleşir" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Sağ" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "Yeni dosyalar not defterinde sağa yerleşir" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Çift tıklama bütün bölgeleri gizler" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 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:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Düzenleyici sekmeleri" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Üst" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Taban" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Yan panel:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Sekme pozisyonları" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Durum çubuğunu göster" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Arayüz" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "Araç Çubu_ğunu Göster" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "_Araç Çubuğunu Menüye Tuttur" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 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:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Araç çubuğu" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Simge tüyü:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Simge boyutu:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Görünüm" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +msgid "Customize Toolbar" +msgstr "Araç Çubuğunu Özelleştir" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Araç Çubuğu" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Satır kaydırma" -#: ../src/interface.c:3349 +#: ../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 " @@ -1827,11 +1836,11 @@ "özellik performans kaybına sebep olur ve bu yüzden yavaş makinalarda pasif " "olmalıdır." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "\"Akıllı\" home tuşunu etkinleştir" -#: ../src/interface.c:3354 +#: ../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 " @@ -1844,11 +1853,11 @@ "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:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Sürükle ve bırak desteğini kapat" -#: ../src/interface.c:3359 +#: ../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" @@ -1856,19 +1865,19 @@ "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:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Katlamayı etkinleştır" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Kod için katlama özelliğini aç ya da kapat" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "Bir katlama noktasında tüm alt katlamaları aç/kapat" -#: ../src/interface.c:3369 +#: ../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." @@ -1876,34 +1885,34 @@ "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:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Derleme hataları için gösterge kullan" -#: ../src/interface.c:3374 +#: ../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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Yeni satır alttaki boşlukları keser" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Satır sonlandırıcı sütun:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Yorum aç/kapa işaretçisi:" -#: ../src/interface.c:3406 +#: ../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." @@ -1911,95 +1920,95 @@ "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:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Özellikler" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Özellikler" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Oto-Girinti modu:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Temel" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Geçerli karakterler" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Eşleme ayraçları" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Tür:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Genişlik" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "Tek girdi için karakterin genişliği" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Girinti koyarken boşluk kullan" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Her girinti için bir sekme kullan" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Sekme genişliği:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 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:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Tab tuşu aralığı" -#: ../src/interface.c:3548 +#: ../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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Girintileme" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Girinti" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Parça tamamlama" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2007,19 +2016,19 @@ "Ö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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +msgid "XML tag autocompletion" msgstr "XML için otomatik tamamlama" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Çok satırlı yorumlara otomatik devam etme" -#: ../src/interface.c:3591 +#: ../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" @@ -2027,11 +2036,11 @@ "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:3593 -msgid "Automatic symbol completion" -msgstr "Otomatik sembol tamamlama" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "Simgeleri otomatik tamamla" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2039,89 +2048,97 @@ "Bilinen sembolleri otomatik tamamlama (fonksiyon isimleri, global " "değişkenler vs.)" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "Dökümandaki bütün kelimeleri otomatik tamamla" + +#: ../src/interface.c:3646 +msgid "Drop rest of word on completion" +msgstr "Tamamlamada kelimenin geri kalanını kes" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "En fazla verilecek sembol ismi teklifi:" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Tamamlama listesi uzunluğu:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "Tamamlama için girilecek karakter sayısı:" +#: ../src/interface.c:3670 +msgid "Characters to type for autocompletion:" +msgstr "Otomatik tamamlanacak karakterler:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"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:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" msgstr "Otomatik tamamlama listesindeki sıralarda uzunluğu gösterir" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Tamamlamalar" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Parantez ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "Yeni parantez kullanımında parantezi otomatik olarak kapat" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Tek tırnak ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 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:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Küme işareti { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 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:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Köşeli Parantez [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 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:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Çift tırnak \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 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:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Tırnak ve kümeleri otomatik kapat" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Tamamlamalar" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Sözdizimi renklendirmesinde renkleri tersine çevir" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2129,45 +2146,45 @@ "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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Girintileme yönergelerini göster" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Beyaz boş bölgeyi göster" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 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:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Satır sonlarını göster" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "Satır sonu karakterini gösterir" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Satır numaralarını göster" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Satır numarası bölgesini gösterir ya da gizler" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "İşaretçi bölümünü göster" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" @@ -2175,36 +2192,36 @@ "Satırları işaretleyebilmek için satır numaralarının sağında ufak bir bölge " "açar" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Son satırda kaydırmayı durdur" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Görünüm" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Uzun satır işareti:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Uzun satır işareti rengi:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Uzun satır işaretinin rengini belirler" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Renk Seçici" -#: ../src/interface.c:3826 +#: ../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 " @@ -2214,11 +2231,11 @@ "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:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Satır" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2226,11 +2243,11 @@ "Düzenleyicide işaretci pozisyonunda düşey bir satır belirtir (ayrıntılar " "için aşağı bkz)" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Arkaplan" -#: ../src/interface.c:3846 +#: ../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 " @@ -2240,55 +2257,55 @@ "karakterlerin arkaplan rengini ayarlayın. (Orantılı fontlar kullanıyorsanız " "tavsiye edilir)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Pasifleştirildi" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Uzun satır işareti" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Gösterim" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Yeni dökümanları komut satırında aç" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Öntanımlı satır sonu karakterleri:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Yeni dosyalar" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Öntanımlı kodlama (yeni dosyalar için):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Öntanımlı kodlama (varolan dosyalar için):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Dosyaları açarken sabit kodlama kullan" -#: ../src/interface.c:3978 +#: ../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 " @@ -2298,53 +2315,53 @@ "kılar. Dosya sizin seçtiğiniz kodlamaya göre açılır (ki genellikle bu " "tavsiye edilmez)" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Kodlamalar" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Dosya sonunda bir satır boş bırak" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Sondaki boşluğu temizle" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Sekmeleri boşluklara dönüştür" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 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:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Dosya kaydı" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Son açılanlar listesinin uzunluğu:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Disk kontrolü zaman aşımı:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2352,27 +2369,27 @@ "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:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1019 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Dosyalar" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Derleme:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Tarayıcı:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Derleme aracı için yol ve deçenekler" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2380,23 +2397,23 @@ "xterm, gnome-terminal veya konsole gibi bir terminal emülatörü ( -e " "seçeneğini kabul etmeli)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 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:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Araç yolları" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Bağlam eylemi:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2407,67 +2424,67 @@ "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:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Komutlar" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Araçlar" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "geliştiricinin e-posta adresi" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "geliştirici isminin baş harfleri" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Başlangıç sürümü:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Yeni dosyaya verilecek sürüm numarası" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Şirket adı" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Geliştirici" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Şirket:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "E-posta adresi:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Başlangıçlar:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Geliştiricinin adı" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Yıl:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Tarih:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Tarih ve Zaman:" -#: ../src/interface.c:4382 +#: ../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." @@ -2475,7 +2492,7 @@ "{tarihzaman} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " "kullanabilirsiniz." -#: ../src/interface.c:4389 +#: ../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." @@ -2483,7 +2500,7 @@ "{yıl} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " "kullanabilirsiniz." -#: ../src/interface.c:4396 +#: ../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." @@ -2491,63 +2508,63 @@ "{tarih} değişkeni için bir biçim belirtin. ANSI C uyumlu karakterleri " "kullanabilirsiniz." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Şema bilgisi" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Şemalar" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "De_ğiştir" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Klavye kısayolları" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Tuş kombinasyonları" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Komut:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Yazdırma için harici bir komut kullan" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Satır numaralarını yazdır" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "Yazdırılacak sayfaya satır numaralarını da ekle" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Sayfa numaralarını yazdır" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Sayfa başlığını yazdır" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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." @@ -2555,19 +2572,19 @@ "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:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Dosyanın sadece adını kullan" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 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:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Tarih biçimi:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2576,537 +2593,553 @@ "Her sayfanın başına eklenecek tarih ve zaman için bir biçim girin. ANSI C " "uyumlu karakterleri kullanabilirsiniz." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Doğal GTK yazdırma kullan" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Yazdırma" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Proje Özellikleri" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Dosya" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Yeni" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Aç" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Seçilen dosyayı aç" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Kaydet" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Farklı kaydet" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Tümünü kaydet" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Yazdır" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Kapat" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Hepsini kapat" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Yeniden yükle" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Proje" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Proje özellikleri" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Geri al" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Tekrarla" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Seçimi veya satırı çoğalt" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Geçerli satır(lar)ı sil" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +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:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Geçerli satıra git" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Görünümü bir satır yukarı kaydır" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Görünümü bir satır aşağı kaydır" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Parçayı tamamla" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "İşaretçiyi parça içinde hareket ettir" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Parça tamamlamayı engelle" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Bağlam eylemi" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Kelimeyi tamamla" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "İpucunu göster" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Makro listesini göster" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Pano" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Kes" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Kopyala" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Yapıştır" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Geçerli satır(lar)ı kopyala" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Geçerli satır(lar)ı kes" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Seç" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Tümünü Seç" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Geçerli kelimeyi seç" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Geçerli satır(lar)ı seç" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Geçerli paragrafı seç" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Biçim" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Seçimi büyült/küçült" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Seçimi Yorum yap/yapma" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Satır(lar)ı yoruma çevir" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Yorumdan satır(lar)a çevir" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Girdiyi artır" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Girdiyi azalt" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Tek boşluk ile girdiyi artır" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Tek boşluk ile girdiyi azalt" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Akıllı girintilendirme" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Özel Komut 1'e gönder" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Özel Komut 2'ye gönder" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Özel Komut 3'e gönder" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "Seçimi Terminale Gönder" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Araya ekle" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Araya tarih ekle" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Alternatif beyaz alan ekle" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Ayarlar" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Ara" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Bul" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Sonrakini Bul" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Öncekini Bul" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Sonraki Seçimi Bul" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Önceki Seçimi Bul" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Değiştir" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Dosyalarda Bul" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Sonraki Mesaj" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Önceki Mesaj" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Kullanım Bul" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Döküman Kullanımı Bul" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +msgid "Mark All" +msgstr "Tümünü İşaretle" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Git" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Bir bölüm geri yolculuk yap" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Bir bölüm ileri yolculuk yap" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Eşleşen ayraca git" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "İşaretçi ayarla" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Sonraki işaretçiye git" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Önceki işaretçiye git" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Etiket Tanımına Git" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Etiket İlanına Git" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Satırın Başına Git" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Satırın Sonuna Git" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +msgid "Go to End of Display Line" +msgstr "Görüntülenen Satırın Sonuna Git" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Önceki Yazı Parçasına Git" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Sonraki Yazı Parçasına Git" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Bak" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Bütün bölümleri Aç/Kapa" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Tam ekran" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Mesaj Penceresini Aç/Kapa" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Araç çubuğunu Aç/Kapa" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Yakınlaştır" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Uzaklaştır" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Odakla" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Düzenleyiciye geç" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Karalama defterine geç" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Terminale geç" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Arama çubuğuna geç" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Araç çubuğuna geç" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Derleyiciye geç" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Not defteri sekmesi" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Soldaki dökümana geç" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Sağdaki dökümana geç" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Son kullanılan dökümana geç" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Dükümanı sola taşı" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Dükümanı sağa taşı" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Dükümanı başa taşı" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Dükümanı sona taşı" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Döküman" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Satır Kaydırmayı aç/kapat" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Satır kesmeyi aç/kapat" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Boşlukları sekmeye çevir" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Geçerli katlamayı aç/kapa" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Tümünü katla" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Tmünü aç" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Simge listesini tekrar yükle" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "İnşa et" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Derle" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "hepsini derle" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Özel hedef yap" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Nesneyi derle" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Sonraki hata" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Önceki hata" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Çalıştır" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Çalıştır (alternatif komut)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "İnşa seçenekleri" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Renk Seçiciyi Göster" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Yardım" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Klavye Kısayolları" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Şu kısayollar düzenlenebilir:" -#: ../src/keybindings.c:1531 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Dökümana geç" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Buraya istediğinizi yazabilirsiniz. Karalama defteri olarak " "kullanabilirsiniz." -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 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." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Hata Ayıklama Mesajları" @@ -3161,7 +3194,7 @@ msgstr "Geany'nin kurulduğu dizinleri göster" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "önceki oturumun dosyalarını yükleme" #: ../src/main.c:143 @@ -3176,24 +3209,24 @@ msgid "Show version and exit" msgstr "Sürümü görüntüle ve çık" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[DOSYALAR...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Şimdi taşınsın mı?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3202,7 +3235,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3211,7 +3244,7 @@ "Eski ayar dizininiz \"%s\" , \"%s\" konumuna taşınamadı (%s). Lütfen dizini " "yeni konuma elle taşıyın." -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3222,22 +3255,22 @@ "Geany'i ayar dizini olmadan kullanmak bazı sorunlara yol açabilir.\n" "Yine de Geany'i açmak ister misiniz?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "'%s' dosyası bulunamadı." -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Bu, Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Ayar dizini oluşturulamadı (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Ayar dosyaları tekrar yüklendi." @@ -3253,7 +3286,7 @@ msgid "_Hide Message Window" msgstr "Mesaj Penceresini Gi_zle" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3262,11 +3295,11 @@ "\"%s\" eklentisi derlenmiş halde Geany'nin bu sürümü ile uyumlu değil, " "lütfen tekrar derleyin." -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Eklenti _Yöneticisi" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3277,23 +3310,23 @@ "Tanım: %s\n" "Sahip(leri): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Aktif" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Eklenti" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Erişilebilir eklenti yok." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Eklentiler" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3301,57 +3334,65 @@ "Aşağıda erişilebilir eklentilerin listesi bulunmakta. Geany açılırken " "çalıştırılacak eklentiler için seçiniz." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Eklenti detayları:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Hareket" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Kısayol" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Tuşu Yakala" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "H_epsini Genişlet" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "Hepsini _Katla" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Hareket" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Kısayol" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "Üzerine _yaz" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Bu kısayolun üzerine yaz?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "'%s' kombinasyonu zaten \"%s\" için kullanılıyor." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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." #. page Templates -#: ../src/prefs.c:1454 +#: ../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:1458 +#: ../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." @@ -3362,7 +3403,7 @@ "ayarları tekrar yüklemeye zorlamalısınız." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3373,7 +3414,7 @@ "olarak düzenlemek için çift tıklayın." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3382,17 +3423,8 @@ "ile derlendiğinde ve Geany GTK 2.10 (veya yukarı bir sürüm) ile " "çalışırken kullanılabilir." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"Not: Araç çubuğu öğelerini düzenlemek için 'ui_toolbar.xml' dosyasını " -"düzenleyebilirsiniz. Lütfen deyatlar için belgeleri inceleyin." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3400,44 +3432,52 @@ "Uyarı: geçerli proje bu ayarları görmezden gelir. Bkz Proje-" ">Özellikler." -#: ../src/printing.c:270 +#: ../src/printing.c:188 +msgid "The editor font is not a monospaced font!" +msgstr "Düzenleyici yazıtipi tek boşluklu!" + +#: ../src/printing.c:189 +msgid "Text will be wrongly spaced." +msgstr "Yazıdaki boşluklar hatalı olacak." + +#: ../src/printing.c:305 #, c-format msgid "Page %d of %d" msgstr "Sayfa %d, toplam %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Döküman Düzeni" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Sayfa %d / %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "%s dosyasının yazdırılması iptal edildi." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "%s dosyası yazdırıldı." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "%s dosyası yazdırılırken hata (%s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 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:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3448,7 +3488,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "\"%s\" yazdırma işlemi başarısız (dönüş kodu: %s)." @@ -3467,19 +3507,19 @@ msgid "C_reate" msgstr "Oluştu_r" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Adı:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Dosya adı:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Temel yol:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3488,41 +3528,41 @@ "Projenin oluşturulacağı ana dizin. Yeni bir tane oluşturabilir veya olan " "dizinlerden kullanabilirsiniz." -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Projenin Temel Klasörünü Seç" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "\"%s\" proje dosyası yüklenemedi." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Proje Aç" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Proje dosyaları" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "\"%s\" projesi kapatıldı." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Tanım:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Temel klasör içinde yap" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Komutu çalıştır:" -#: ../src/project.c:457 +#: ../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." @@ -3530,81 +3570,81 @@ "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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Dosya örnekleri:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Onaylamadan kapatmak istiyor musunuz?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "'%s' projesi zaten açık." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Belirtilen proje ismi çok kısa." -#: ../src/project.c:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Geçersiz bir dosya adı girdiniz" -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Projenin ana yolunu oluştur?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "\"%s\" yolu bulunamadı." -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Proje temel dizini oluşturulamadı (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Proje dosyası yazılamadı (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "\"%s\" projesi oluşturuldu." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "\"%s\" projesi kaydedildi." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Proje Dosya Adını Seç" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Proje Çalıştırma Komutunu Seç" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "\"%s\" projesi açıldı." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Düzenli ifadeleri k_ullan" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3612,15 +3652,15 @@ "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:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Geriye do_ğru ara" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3628,395 +3668,403 @@ "Yazıdaki \\\\, \\t, \\n, \\r ve \\uXXXX (Unicode) karakterleri kontrol " "karakterleri ile yer değiştir" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Büyük/Küçük harf duy_arlı" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Bütün kelimeyi e_şle" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Keli_menin başından eşle" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Önceki" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "So_nraki" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "_Ara:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Tümünü Bul" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "İ_şaretle" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "Dökümandaki bütün eşleşmeleri işaretle" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "_Oturumda" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "D_ökümanda" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "_Diyaloğu kapat" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 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:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Değişti_r & Bul" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "Şununla değiş_tir:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Tüm_ünü değiştir" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "Seç_im içinde" -#: ../src/search.c:592 +#: ../src/search.c:607 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:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Dizin:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "K_odlama:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Sabit di_ziler" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Grep düzenli ifadeler" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 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:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "Harici düz_enli ifadeler" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Alt klasö_rlerde de uygula" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "Arama sonuçlarını ters çev_ir" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "Eşlenen değil, eşlenmeyen satırları seç" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Ekstra s_eçenekler:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Grep için diğer seçenekler" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "%d eşleşme bulundu, \"%s\"" msgstr[1] "%d eşleşme bulundu, \"%s\"" -#: ../src/search.c:1184 +#: ../src/search.c:1203 #, 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." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Dosyalarda bulmak için geçersiz dizin." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Bulunacak yazı yok." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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." -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Arıyor..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (dizin: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Dizin açılamadı (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Eşleşme bulunamadı." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Bölüm" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Bölüm" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Kısım1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Kısım2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Kısım3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Ek" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Diğer" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Modül" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Türler" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Tür oluşturucular" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Fonksiyonlar" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Bölümler" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Anahtarlar" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Değişkenler" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Komut" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Çevre" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Altbölüm" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Alt-Altbölüm" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Etiket" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Yapılar" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Paket" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Benim" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Yerel" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Bizim" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Arayüzler" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Sınıflar" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Sabitler" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Çapalar" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "H1 Başlıkları" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "H2 Başlıkları" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "H3 Başlıkları" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "Kimlik Seçicileri" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Tür Seçicileri" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Modüller" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Tekliler" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Yöntemler" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Ad boşlukları" + +#: ../src/symbols.c:725 +msgid "Procedures" +msgstr "Yordamlar" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "İçe aktarılanlar" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Üyeler" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Etiketler" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Alt programlar" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Bloklar" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Makrolar" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Tanımlar" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Hedefler" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Ad boşlukları" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Yapılar" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1311 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "\"%s\" için bilinmeyen dosya uzantısı.\n" -#: ../src/symbols.c:1332 +#: ../src/symbols.c:1358 #, 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" -#: ../src/symbols.c:1339 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4025,7 +4073,7 @@ "Kullanım: %s -g \n" "\n" -#: ../src/symbols.c:1340 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4036,169 +4084,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:1354 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Etiketleri Yükle" -#: ../src/symbols.c:1361 +#: ../src/symbols.c:1387 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:1381 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s etiket dosyası yüklendi '%s'." -#: ../src/symbols.c:1383 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Etiket dosyası '%s' yüklenemedi." -#: ../src/symbols.c:1517 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1519 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "\"%s\" için tanım bulunamadı." -#: ../src/symbols.c:1810 -msgid "_Expand All" -msgstr "H_epsini Genişlet" - -#: ../src/symbols.c:1815 -msgid "_Collapse All" -msgstr "Hepsini _Katla" - -#: ../src/symbols.c:1825 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "İsme Göre Sı_rala" -#: ../src/symbols.c:1832 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Görünüme Göre Sır_ala" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Geçerli dosyayı kaydet" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Tümünü kaydet" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Bütün açık dosyaları kaydet" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Geçerli dosyayı diskten tekrar yükle" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Geçerli dosyayı kapat" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Bütün açık dosyaları kapat" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Geçerli seçimi kes" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Geçerli seçimi kopyala" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Panodaki içeriği yapıştır" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Geçerli seçimi sil" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Son yapılan düzenlemeyi geri al" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Son yapılan düzenlemeyi tekrar uygula" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Geçerli dosyayı derle" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Geçerli dosyayı çalıştır veya incele" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Yazıya yaklaş" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Yazıdan uzaklaş" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Girintiyi azalt" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Girintiyi artır" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Girilen yazıyı geçerli dosyada bul" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Girilen satıra git" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Seçenekler penceresini göster" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Geany'den Çık" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "Belgeyi yazdır" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" -"Bu dosyada yaptığınız tüm değişikliklerin uygulanması için, Geany'i yeniden " -"başlatmalısınız." +#: ../src/toolbar.c:80 +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:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Yeni bir dosya oluştur" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Bir dosyayı aç" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Git" +#: ../src/toolbar.c:533 +msgid "Separator" +msgstr "Ayırıcı" + +#: ../src/toolbar.c:534 +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:913 +msgid "Available Items" +msgstr "Erişilebilir Öğeler" + +#: ../src/toolbar.c:934 +msgid "Displayed Items" +msgstr "Gösterilen Öğeler" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4266,123 +4323,143 @@ msgid "Characters:" msgstr "Karakter:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Etiket bulunamadı" -#: ../src/treeviews.c:491 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Semb_ol Listesini Göster" -#: ../src/treeviews.c:499 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "_Döküman Listesini Göster" -#: ../src/treeviews.c:507 ../plugins/filebrowser.c:586 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Araç Çubuğunu G_izle" +#: ../src/treeviews.c:591 +msgid "Show _Paths" +msgstr "Yolları Göster" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "sat: %d\t süt: %d\t seç: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "SO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "mod: %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "kodlama: %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "dosya türü: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "alan: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Yazıtipi güncellendi (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C Standart Kütüphanesi" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C Standart Kütüphanesi)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ Standart Kütüphanesi" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "Özel Tari_h Biçimi Ayarla" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Dizin Seç" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Dosya Seç" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "A_yar Dosyaları" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Tümünü kaydet" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Tümünü Kapat" +#: ../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 "Terminal" @@ -4510,7 +4587,7 @@ "hali F10). Pasifleştirmek sanal terminalde MC kullanmak gibi durumlarda " "kullanışlı olabilir." -#: ../src/vte.c:840 ../plugins/filebrowser.c:1125 +#: ../src/vte.c:840 ../plugins/filebrowser.c:1122 msgid "Follow the path of the current file" msgstr "Geçerli dosyanın yolunu izle" @@ -4544,161 +4621,145 @@ "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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geany proje dosyaları" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Çalıştırılabilir dosyalar" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Hata" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Soru" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Uyarı" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Bilgi" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Sınıf Derleyici" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Yeni sınıf türleri için kaynak dosyaları oluşturur." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Sınıf Oluştur" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Sınıf" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Sınıf adı:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Header dosyası:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Kaynak dosya:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Kalıntı" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Temel sınıf:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Temel header(başlık):" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Global" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Temel GTürü:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Seçenekler" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Oluşturucu yap" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Yıkıcı yap" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+ oluşturucu türü" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "_Sınıf Oluştur" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "_C++ Sınıfı" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "_GTK+ Sınıfı" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML Karakterleri" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "'&' türünde HTML kümeleri ekler." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Geany geliştirme takımı" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML karakterleri" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1 karakterleri" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Yunan karakterleri" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Matematik karakterleri" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Teknik karakterler" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Ok karakterleri" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Noktalama karakterleri" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Diğer karakterler" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Özel Karakterler" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "Ara_ya Ekle" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4706,164 +4767,164 @@ "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:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Karakter" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (isim)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Özel HTML karakterler_i Ekle" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "HTML yer değiştirmesi" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "_HTMLBirleşimi" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "Özel karakterlerin toplu yer değişimi" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Özel HTML karakterleri Ekle" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "Özel karakterleri değiştir" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "Eklenti durumunu değiştir" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Dışa aktar" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Geçerli dosyayı farklı formatlarda dışarı aktarır." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Dosyayı Dışa Aktar" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "Geçerli yakınlaştırma seviyesini k_ullan" -#: ../plugins/export.c:193 +#: ../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" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Döküman '%s' olarak başarıyla dışa aktarıldı." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "'%s' dosyası yazılamadı (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "Dı_şa Aktar" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "_HTML Olarak" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "_LaTeX Olarak" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Dosya Yönetici" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Araç çubuğuna bir dosya yönetim sekmesi ekler." -#: ../plugins/filebrowser.c:329 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Çok fazla nesne seçildi!" -#: ../plugins/filebrowser.c:405 +#: ../plugins/filebrowser.c:399 #, 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:561 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "_Harici olarak aç" -#: ../plugins/filebrowser.c:567 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "Dosyalarda _Bul" -#: ../plugins/filebrowser.c:577 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Gizli Dosyaları G_öster" -#: ../plugins/filebrowser.c:769 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Yukarı" -#: ../plugins/filebrowser.c:774 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Tazele" -#: ../plugins/filebrowser.c:779 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Ev" -#: ../plugins/filebrowser.c:784 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Yolu dökümandan ayarla" -#: ../plugins/filebrowser.c:792 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Filtreyi temizle" -#: ../plugins/filebrowser.c:806 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Filtre:" -#: ../plugins/filebrowser.c:1025 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Dosya Listesini Odakla" -#: ../plugins/filebrowser.c:1027 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Yol Girdisini Odakla" -#: ../plugins/filebrowser.c:1070 ../plugins/saveactions.c:478 +#: ../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:1095 +#: ../plugins/filebrowser.c:1092 msgid "External open command:" msgstr "Harici açma komutu:" -#: ../plugins/filebrowser.c:1104 +#: ../plugins/filebrowser.c:1101 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -4877,15 +4938,15 @@ "%f dosya adı ile beraber tam dosya yolunu\n" "%d ise sadece dosya yolunu belirtir" -#: ../plugins/filebrowser.c:1110 +#: ../plugins/filebrowser.c:1107 msgid "Show hidden files" msgstr "Gizli dosyaları göster" -#: ../plugins/filebrowser.c:1116 +#: ../plugins/filebrowser.c:1113 msgid "Hide object files" msgstr "Nesne dosyalarını sakla" -#: ../plugins/filebrowser.c:1120 +#: ../plugins/filebrowser.c:1117 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -4893,40 +4954,40 @@ "Dosya yöneticisinde oluşturulmuş nesne dosyalarını görüntüleme, bu dosyalar; " "*.o, *.obj. *.so, *.dll, *.a, *.lib" -#: ../plugins/filebrowser.c:1131 -msgid "Set the project's base directory" -msgstr "Projenin ana dizinini ayarla" +#: ../plugins/filebrowser.c:1128 +msgid "Use the project's base directory" +msgstr "Projenin ana dizinini kullan" -#: ../plugins/filebrowser.c:1135 +#: ../plugins/filebrowser.c:1132 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:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Kaydetme Eylemleri" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "Bu eklenti dosyaları kaydetmek için değişik seçenekler sunar." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Yedek Kopya: Dizin oluşturulamadı (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Yedek Kopya: Dosya okunamadı (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Yedek Kopya: Dosya kaydedilemedi (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4934,104 +4995,134 @@ msgstr[1] "Otomatik Kayıt: %d dosya otomatik olarak kaydedildi." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Dizin Seç" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Yedek için seçilen dizin yok ya da yazılabilir durumda değil." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Otomatik Kayıt" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Etkinleştir" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "Otomat_ik kayıt aralığı:" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "saniye" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "Eğer dosyalar otomatik olarak kaydedilirse bir durum mesa_jı görüntüle" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Sadece açık olan dos_yayı kaydet" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Bütün a_çık dosyaları kaydet" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Anlık Kayıt" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "Yeni açılan dosyalar için dosya t_ürü:" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Yedek Kopyası" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "Yedekleri tutmak için _dizin:" -#: ../plugins/saveactions.c:686 +#: ../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\"):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "Yedek dizininde klasör seviye_leri:" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Pencereyi Böl" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "Düzenleyiciyi iki pencereye böler." -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +msgid "Show the current document" +msgstr "Geçerli dökümanı görüntüle" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Birleştir" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "Pencere_yi Böl" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Yatay" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Dikey" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "Yatay olarak böl" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "Dikey olarak böl" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "Birleştir" +#~ msgid "Diff file" +#~ msgstr "Diff dosyası" + +#~ msgid "reStructuredText file" +#~ msgstr "reStructuredText dosyası" + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ msgstr "" +#~ "Bu dosyada yaptığınız tüm değişikliklerin uygulanması için, Geany'i " +#~ "yeniden başlatmalısınız." + +#~ msgid "Select _All" +#~ msgstr "Tümünü Se_ç" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Otomatik sembol tamamlama" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ msgstr "" +#~ "Not: Araç çubuğu öğelerini düzenlemek için 'ui_toolbar.xml' dosyasını " +#~ "düzenleyebilirsiniz. Lütfen deyatlar için belgeleri inceleyin." + #~ msgid "" #~ "Add page numbers at the bottom of each page, it takes 2 lines of the page" #~ msgstr "" @@ -5205,9 +5296,6 @@ #~ msgid "Runs in debug mode (means being verbose)" #~ msgstr "Hata ayıklama modunda çalışıyor (çok fazla çıktı olacak)" -#~ msgid "Show _Full Path Name" -#~ msgstr "Tam Yolu _Göster" - #~ msgid "Command stopped because the current file has no extension." #~ msgstr "Dosyanın uzantısı olmadığından komut durduruldu." diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/uk.po /tmp/ssBwSf4GIv/geany-0.18/po/uk.po --- geany-0.17/po/uk.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/uk.po 2009-08-16 17:18:28.000000000 +0100 @@ -4,9 +4,9 @@ # Boris Dibrov , 2007, 2008 msgid "" msgstr "" -"Project-Id-Version: Geany 0.16\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2008-02-04 12:44+0300\n" "Last-Translator: Boris Dibrov \n" "Language-Team: \n" @@ -29,69 +29,69 @@ msgid "Integrated Development Environment" msgstr "Об'єднане середовище розробки" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Про Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Швидке та легке графічне середовище" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(побудова під час, або після %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "Інформація" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Розробники" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "підтримка" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "розробник" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "перекладацька підтримка" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Перекладачі" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Попередні перекладачі" -#: ../src/about.c:330 +#: ../src/about.c:332 #, fuzzy msgid "Contributors" msgstr "Конструктори типів" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:366 +#: ../src/about.c:368 #, fuzzy msgid "Credits" msgstr "Допомагали" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Ліцезнія" -#: ../src/about.c:389 +#: ../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." @@ -99,7 +99,7 @@ "Текст ліцензії не знайдено, будь-ласка відвідайте http://www.gnu.org/" "licenses/gpl-2.0.txt для її перегляду он-лайн." -#: ../src/build.c:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -108,136 +108,136 @@ "Не вдається знайти термінал \"%s\" (перевірте шлях до інструменту термінала " "у налаштуваннях)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Помилка виконання \"%s\" (стартовий скрипт не був створений)" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Помилка процесу (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (у теці: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Помилка при спробі змінити робочу директорію на \"%s\"" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "Неможливо виконати файл у VTE тому, що очевидно він містить команду." -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Помилка під час компіляції." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Компіляція була успішною." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "_Компіляція" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../src/build.c:1047 ../src/build.c:2120 ../src/interface.c:976 msgid "_Build" msgstr "_Побудова" #. build the code with make all -#: ../src/build.c:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Виконати make над _об'єктом" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "_Наступна помилка" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 #, fuzzy msgid "_Previous Error" msgstr "_Попередній" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "_Обрати вкладення та аргументи" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 #, fuzzy msgid "LaTeX -> _DVI" msgstr "LaTeX -> DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 #, fuzzy msgid "LaTeX -> _PDF" msgstr "LaTeX -> PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 #, fuzzy msgid "_View DVI File" msgstr "Показати файл DVI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 #, fuzzy msgid "V_iew PDF File" msgstr "Відобразити PDF файл" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 #, fuzzy msgid "_Set Arguments" msgstr "Оберіть аргументи" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Оберіть аргументи" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" "Оберіть програми та опції для компіляції та відображення файлів (La)TeX" -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "створення DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "створення PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "попередній перегляд DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "попередній перегляд PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -246,75 +246,75 @@ "%f буде замінено на ім'я поточного файлу, наприклад test_file.c\n" "%e буде замінено на ім'я поточного файлу без розширення, наприклад test_file" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Оберіть вкладення та аргументи" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "Оберіть команду для будування та виконання програми." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s команди" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Компіляція:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Побудова:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Виконання:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 #, fuzzy msgid "Build the current file" msgstr "Компілювати поточний файл" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Нетипові налаштування make" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" "Тут введіть власні опції, увесь введений текст буде переданий команді make." -#: ../src/build.c:1976 +#: ../src/build.c:1967 #, fuzzy msgid "Build the current file with Make and the default target" msgstr "" "Побудова поточного файлу з інструментом make та кінцевою точкою за " "замовчанням" -#: ../src/build.c:1979 +#: ../src/build.c:1970 #, fuzzy msgid "Build the current file with Make and the specified target" msgstr "" "Побудова поточного файлу з інструментом make та вказаною кінцевою точкою" -#: ../src/build.c:1982 +#: ../src/build.c:1973 #, fuzzy msgid "Compile the current file with Make" msgstr "Компілювати поточний файл" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "Помилка при спробі виконати відображену програму" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "Не має змоги зупинити процес (%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "Більше не має помилок побудови." @@ -322,8 +322,8 @@ msgid "Do you really want to quit?" msgstr "Ви дійсно бажаєте вийти?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "_Перезавантажити" @@ -336,53 +336,53 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Ви впевнені, що бажаєте перезавантажити '%s'?" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "До рядку" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Введіть рядок до якого ви хочете переміститись:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "" "Будь-ласка оберіть тип для поточного файлу перед використанням цієї функції." -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "дд.мм.рррр" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "мм.дд.рррр" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "рррр/мм/дд" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "дд.мм.рррр гг:хх:сс" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "мм.дд.рррр гг:хх:сс" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "рррр/мм/дд гг:хх:сс" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "Ви_користовувати власний формат дати" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Власний формат дати" -#: ../src/callbacks.c:1495 +#: ../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." @@ -390,25 +390,25 @@ "Тут введіть власний формат дати й часу. Ви можете використовувати будь який " "формат часу що буде використаний функцією ANSI C strftime." -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "" "Не вдається конвертувати рядок формату дати (можливо рядок занадто довгий)." -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "Більше не залишилося повідомлень." #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Відкрити файл" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Показати" -#: ../src/dialogs.c:150 +#: ../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." @@ -416,29 +416,29 @@ "Відкрити файл тільки для читання. Якщо ви оберете більше одного файлу усі " "будуть відкриті тільки для читання." -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Визначити з розширення файлу" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Визначити з файлу" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "Опції" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "Показати _приховані файли" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Встановити кодовування:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -452,11 +452,11 @@ "вказаним кодуванням." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Встановити тип файлу:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -468,24 +468,33 @@ "Врахуйте, що якщо ви вказуєте декілька файлів, то вони усі будуть відкрити " "як файли вказаного розширення." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "_Обминути" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Зберегти файл" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Змінити _назву" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 #, fuzzy msgid "Save the file and rename it" msgstr "Зберегти файл та змінити його назву." -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Відкрити файл у новій вкладці." -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 #, fuzzy msgid "" "Keep the current unsaved document open and open the newly saved file in a " @@ -494,24 +503,41 @@ "Не закриваючи поточного незбереженого файлу відкрити його збережений вміст у " "новій вкладці." -#: ../src/dialogs.c:622 +#: ../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 "_Не зберігати." -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Файл '%s' не збережено." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Чи бажаєте зберегти файл до того як вийти?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Оберіть шрифт" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." @@ -519,106 +545,106 @@ "Виникла помилка або інформація про файл не була знайдена (наприклад з нового " "файлу)." -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "невідоме" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Налаштування" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Тип:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Розмір:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Розташування:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Тільки читання:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(тільки у Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Кодування:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(з BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(без BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Модифікований:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Змінений:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Використаний:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Дозволи:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Читає:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Пише:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Власник:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Група:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Інше:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Файл %s зачинено." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Новий файл \"%s\" відкрито." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Файл %s (%s) відкрити неможливо" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -633,12 +659,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Файл \"%s\" помилковий %s." -#: ../src/document.c:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -646,50 +672,53 @@ msgstr "" "Файл \"%s\" має вигляд не текстового або кодування файлу не підтримується." -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Пробіли" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "відступи" -#: ../src/document.c:1174 +#: ../src/document.c:1128 #, 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:1179 +#: ../src/document.c:1133 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "Встановлення %s розподіленого режиму." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Неприпустиме ім'я файлу" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Файл %s перезавантажено." -#: ../src/document.c:1354 +#. 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 "Файл %s відкрито(%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", тільки читання" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "Помилка зберігання файлу." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -698,7 +727,7 @@ "Помилка під час конвертації файлу з UTF-8 у \"%s\". Файл залишено не " "збереженим." -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -707,52 +736,52 @@ "Повідомлення про помилку: %s\n" "Помилка виникла у \"%s\" (рядок: %d, стовпчик: %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Повідомлення про помилку: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Помилка зберігання файлу." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Помилка при збереженні файлу (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Файл %s збережено." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" не знайдено." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Повернутися до початку і шукати знову?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "\"%s\" не зустрічається у файлі." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../src/document.c:2022 ../src/document.c:2031 #, 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:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Ви дійсно бажаєте перезавантажити його?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -761,33 +790,21 @@ "Файл '%s' на жорсткому диску новіший за\n" "поточний буфер." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, fuzzy, c-format msgid "File \"%s\" was not found on disk!" msgstr "\"%s\" не знайдено." -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 #, fuzzy msgid "Enter Tab Width" msgstr "Ширина абзацу:" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" @@ -888,135 +905,123 @@ msgstr "Китайські традиційні" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Японські" -#: ../src/encodings.c:141 ../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 "Корейські" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Без кодування" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "_Західні Європейські" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "_Східні Європейські" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "Східні _Азіатські" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "_SE & SW Азіатські" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "_Центрального сходу" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Юнікод" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Нічого" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Файл-джерело %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "Файл-джерело %s" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Нічого" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Скрипт на мові Shell" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "документ XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Каскадні таблиці стилів" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL Dump файл" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Diff файл" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Файл конфігурацій" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 #, fuzzy msgid "Gettext translation file" msgstr "перекладацька підтримка" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, fuzzy, c-format msgid "%s script file" msgstr "Скрипт на мові Shell" -#: ../src/filetypes.c:518 -#, fuzzy -msgid "reStructuredText file" -msgstr "файл reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Мови _програмування" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Мови _скриптів" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Мови _розмітки" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "_Інші мови" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Усі вихідні коди" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Усі файли" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "безіменний" @@ -1030,8 +1035,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "невидимий" @@ -1039,7 +1044,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Відкрити _обраний файл" @@ -1060,12 +1065,12 @@ msgid "Page Set_up" msgstr "Налаштування _сторінки" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 #, fuzzy msgid "Close Ot_her Documents" msgstr "Закрити поточний файл" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "_Закрити усе" @@ -1073,90 +1078,86 @@ msgid "_Edit" msgstr "_Редагування" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "_Виділити усі" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "_Формат" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "Перемикач вмісту _виділення" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "_Коментувати рядок(-ки)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "З_няти коментар з рядку(-ів)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "_Перемикач закоментованості рядку" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "_Подвоїти рядок або виділене" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "З_більшити відступ" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "З_меншити відступ" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "_Надіслати виділене до" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Надіслати виділене до" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "_Вставити коментарі" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "Додати історію зміни" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 #, fuzzy msgid "Insert File _Header" msgstr "Додати заголовок файлу" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 #, fuzzy msgid "Insert _Function Description" msgstr "Додати опис функції" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 #, fuzzy msgid "Insert _Multiline Comment" msgstr "Додати багаторядковий коментар" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 #, fuzzy msgid "Insert _GPL Notice" msgstr "Додати GPL повідомлення" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 #, fuzzy msgid "Insert _BSD License Notice" msgstr "Додати повідомлення BSD ліцензії" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Додати _дату" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Д_одати \"include <...>\"" @@ -1181,7 +1182,7 @@ msgid "Find in F_iles" msgstr "Шукати у _файлі" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "_Замінити" @@ -1203,7 +1204,7 @@ msgid "Pr_evious Message" msgstr "Наступне повідомлення" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "_Йти до рядку" @@ -1232,7 +1233,7 @@ msgid "Show Side_bar" msgstr "Показати _бічну панель" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Редактор" @@ -1280,17 +1281,17 @@ msgid "In_dent Type" msgstr "_Розподілений документ" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 #, fuzzy msgid "_Tabs" msgstr "відступи" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 #, fuzzy msgid "_Spaces" msgstr "Пробіли" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 #, fuzzy msgid "T_abs and Spaces" msgstr "_Заміняти відступи пробілами" @@ -1414,7 +1415,7 @@ msgid "_Debug Messages" msgstr "Повідомлення" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Символи" @@ -1438,83 +1439,88 @@ msgid "Scribble" msgstr "Друк" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 #, fuzzy msgid "Images _and Text" msgstr "Текст та зображення" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 #, fuzzy msgid "_Images Only" msgstr "Тільки зображення" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 #, fuzzy msgid "_Text Only" msgstr "Тільки текст" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 #, fuzzy msgid "_Large Icons" msgstr "Великі кнопки" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 #, fuzzy msgid "_Small Icons" msgstr "Маленькі кнопки" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "Маленькі кнопки" -#: ../src/interface.c:1770 +#: ../src/interface.c:1769 #, fuzzy -msgid "_Hide toolbar" +msgid "_Customize Toolbar" msgstr "Прибрати панель інструментів" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "Прибрати панель інструментів" + +#: ../src/interface.c:2094 #, fuzzy msgid "Find _Usage" msgstr "Користування пошуком" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 #, fuzzy msgid "Find _Document Usage" msgstr "Користування пошуком" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 #, fuzzy msgid "Go to _Tag Definition" msgstr "Перейти до визначення ярлика" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 #, fuzzy msgid "Go to T_ag Declaration" msgstr "Перейти до об'яви ярлику" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 #, fuzzy msgid "Conte_xt Action" msgstr "Пов'язані дії" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Налаштування" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "Завантажити файли з останнього відвідування" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "На початку роботи Geany завантажити файли з останньої сесії" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Завантажити підтримку віртуального терміналу" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 #, fuzzy msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " @@ -1523,41 +1529,41 @@ "Віртуальний термінал емуляції (VTE) буде завантажено на початку роботи. " "Вимкніть якщо він не потрібен." -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Активувати підтримку додатків" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Початок роботи" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Зберегти позицію та розмір вікна" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "" "Зберегти позицію та розмір вікна і відновляти їх при кожному виклику Geany" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Підтвердження виходу" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "Питати підтвердження на виході." -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Завершення роботи" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Tека початку роботи:" -#: ../src/interface.c:2758 +#: ../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." @@ -1566,40 +1572,40 @@ "теки мусить бути абсолютним. Залишіть незайманим для використання поточної " "робочої теки." -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Файли проекту:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "Тека для початку роботи під час відкривання файлів проекту" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 #, fuzzy msgid "Extra plugin path:" msgstr "Активувати підтримку додатків" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Шляхи" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 #, fuzzy msgid "Startup" msgstr "Статус" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "Звуковий сигнал при помилці і невдалій компіляції" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 #, fuzzy msgid "" "Whether to beep if an error occurred or when the compilation process has " @@ -1608,11 +1614,11 @@ "Ви почуєте звуковий сигнал при виникненні помилки або по закінченню " "компіляції." -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "Перемкнутися до списку повідомлень статусу при новому повідомленні" -#: ../src/interface.c:2856 +#: ../src/interface.c:2876 #, fuzzy msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " @@ -1621,11 +1627,11 @@ "Перемкнутися до вкладки повідомлень статусу (у нижньому вікні з вкладками) " "якщо нові повідомлення статусу будуть надходити." -#: ../src/interface.c:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "Не показувати повідомлення у вікні статусу" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1633,11 +1639,12 @@ "Прибрати усі повідомлення з панелі статусу. Наступні повідомлення будуть " "з'являтися у ній же." -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "Автоматично фокусувати віджети (фокусування дотримуючись миші)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1646,16 +1653,16 @@ "Автоматично надати фокус віджету під курсором миші. Працює для вікна віджета " "головного редактору, друку, полів пошуку та переходу до рядку і для VTE." -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Інше" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "" "Завжди при досягненні кінця файлу починати спочатку і прибирати вікно пошуку" -#: ../src/interface.c:2891 +#: ../src/interface.c:2911 #, fuzzy msgid "" "Always wrap search around the document and hide the Find dialog after " @@ -1664,43 +1671,43 @@ "Завжди при досягненні кінця файлу починати с початку та прибирати діалог " "пошуку після натискання наступне/попереднє" -#: ../src/interface.c:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2896 +#: ../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:2898 +#: ../src/interface.c:2918 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "Помилкова тека для пошуку файлів." -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 #, fuzzy msgid "Search" msgstr "Бічна панель" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "Використовувати файли сесії базовані на проекті" -#: ../src/interface.c:2924 +#: ../src/interface.c:2944 #, fuzzy msgid "" "Whether to store a project's session files and open them when re-opening the " "project" msgstr "Зберігати файли сесії та відкривати їх при відкритті проекту." -#: ../src/interface.c:2926 +#: ../src/interface.c:2946 #, fuzzy msgid "Store project file inside the project base directory" msgstr "Чи створити базову теку для проекту?" -#: ../src/interface.c:2929 +#: ../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 " @@ -1708,76 +1715,76 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Проекти" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 #, fuzzy msgid "Miscellaneous" msgstr "Інше" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Загальне" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Показати список символів" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Активізація або відключення списку символів" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Показати список документів" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Активізація або відключення списку документів" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Бічна панель" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Список символів:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Вікно повідомлень:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Редактор:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Встановити шрифт для вікна повідомлень" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "Встановити шрифт для списку символів" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Встановити шрифт для редактора" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Шрифти" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Показати вкладки редактору" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Показати кнопки зачинення" -#: ../src/interface.c:3064 +#: ../src/interface.c:3084 #, fuzzy msgid "" "Shows a small cross button in the file tabs to easily close files when " @@ -1786,109 +1793,114 @@ "Показувати маленьку кнопку-хрестик у вкладках файлів для полегшеного " "закриття файлу при натисканні на нього (потребує перезапуску Geany)." -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Розташування нових вкладок з файлами:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Наліво" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "Вкладки з файлами будуть розташовані зліва від блокноту" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Направо" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "Вкладки з файлами будуть розташовані зправа від блокноту" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 #, fuzzy msgid "Double-clicking hides all additional widgets" msgstr "Перемикач усіх додаткових віджетів" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 #, fuzzy msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Перемикач усіх додаткових віджетів" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Вкладки редактору" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Вершина" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Низовина" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Бічна панель:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Розташування вкладки" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Показати панель статусу" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 #, fuzzy msgid "Whether to show the status bar at the bottom of the main window" msgstr "Показувати панель статусу у низовині головного вікна." -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Інтерфейс" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "Показати панель інструментів" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Панель інструментів" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Стиль кнопки:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Розмір кнопки:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Вигляд" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Показувати панель _інструментів" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Панель інструментів" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Переніс рядку" -#: ../src/interface.c:3349 +#: ../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 " @@ -1898,11 +1910,11 @@ "перенесення рядків потребує великої продуктивності для великих документів, " "тому на повільних комп'ютерах варто не вмикати." -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "" -#: ../src/interface.c:3354 +#: ../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 " @@ -1911,11 +1923,11 @@ "its current position." msgstr "" -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Заборонити перетягування" -#: ../src/interface.c:3359 +#: ../src/interface.c:3403 #, fuzzy msgid "" "Disable drag and drop completely in the editor window so you can't drag and " @@ -1924,20 +1936,20 @@ "Повністю заборонити перетягування у вікні редактору щоб унеможливити " "переміщення мишею будь якого виділення назовні або до вікна редактору." -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Дозволити згортку" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Дозволити згортку коду" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 #, fuzzy msgid "Fold/unfold all children of a fold point" msgstr "Згорнути/розгорнути усі вкладені згортки у місці згортання" -#: ../src/interface.c:3369 +#: ../src/interface.c:3413 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1946,11 +1958,11 @@ "Згорнути або розгорнути усі внутрішні згортання у позиції. При натисненні " "Shift і кліку по символу згортки відбувається зміна його стану." -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "Виділяти рядки, на котрих були помилки компіляції" -#: ../src/interface.c:3374 +#: ../src/interface.c:3418 #, fuzzy msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " @@ -1959,154 +1971,154 @@ "Використовувати індикатори (хвилясті стрічки під текстом) для виділення " "рядків на котрих були попередження або помилки компіляції." -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Новий рядок видаляє пробіли у кінці попереднього" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 #, fuzzy msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" "Дозволити при початку нового рядку видаляти пробіли після тексту " "попереднього рядку" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 #, fuzzy msgid "Comment toggle marker:" msgstr "Межа довгого рядку:" -#: ../src/interface.c:3406 +#: ../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 "" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Додаткові можливості" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 #, fuzzy msgid "Features" msgstr "Додаткові можливості" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Режим авто-абзацу:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Базове" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Поточні символи" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Парні скоби" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Тип:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 #, fuzzy msgid "Width:" msgstr "Пише:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 #, fuzzy msgid "The width in chars of a single indent" msgstr "Ширина абзацу у кількості звичайних символів" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 #, fuzzy msgid "Hard tab width:" msgstr "Ширина абзацу:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 #, fuzzy msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "Визначати тип абзацу з вмісту файлу під час відкриття." -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 #, fuzzy msgid "Tab key indents" msgstr "Збільшити відступ" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Абзац" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 #, fuzzy msgid "Indentation" msgstr "Абзац" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "" -#: ../src/interface.c:3581 +#: ../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:3583 +#: ../src/interface.c:3627 #, fuzzy -msgid "XML tag auto completion" +msgid "XML tag autocompletion" msgstr "Авто-завершення теґів XML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" "Автоматичне завершення та зачинення початого XML теґу (включаючи HTML теґи)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3591 +#: ../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 "" -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2114,143 +2126,152 @@ "Автоматичне завершення знайомих слів у відкритому файлі (назви функцій, " "глобальні змінні, ...)" -#: ../src/interface.c:3604 +#: ../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 "" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Символи до друку для завершення:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" -#: ../src/interface.c:3640 +#: ../src/interface.c:3692 #, fuzzy -msgid "Display height in rows for the auto completion list" +msgid "Display height in rows for the autocompletion list" msgstr "Номери рядків для показу у списку авто-доповнення" -#: ../src/interface.c:3649 +#: ../src/interface.c:3701 #, fuzzy -msgid "Maximum number of entries to display in the auto completion list" +msgid "Maximum number of entries to display in the autocompletion list" msgstr "Номери рядків для показу у списку авто-доповнення" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Завершення" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 #, fuzzy msgid "Completions" msgstr "Завершення" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Інвертувати кольори підсвічення синтаксису" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 #, fuzzy msgid "Show indentation guides" msgstr "Показати керівників розподілення" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 #, fuzzy msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" "Показувати невеличку стрічку з точок для допомоги у використанні правого " "абзацу." -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Показувати пробіли" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 #, fuzzy msgid "Marks spaces with dots and tabs with arrows" msgstr "Виділити пробіли крапками а відступи стрілками." -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Виділяти кінці рядків" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "Виділити символи кінця рядку" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 #, fuzzy msgid "Show line numbers" msgstr "Показувати _номери рядків" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 #, fuzzy msgid "Shows or hides the Line Number margin" msgstr "Показати чи приховати границю номерів рядків" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 #, fuzzy msgid "Show markers margin" msgstr "Показати _межу виділення" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 #, fuzzy msgid "" "Shows or hides the small margin right of the line numbers, which is used to " @@ -2259,37 +2280,37 @@ "Показувати або приховувати невелику межу на номерах рядків котра " "використовується для виділення рядків." -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 #, fuzzy msgid "Stop scrolling at last line" msgstr "Переміститись до поточного рядку" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Показати" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Межа довгого рядку:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Колір межі довгого рядку:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Оберіть колір межі довгого рядку" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Палітра кольорів" -#: ../src/interface.c:3826 +#: ../src/interface.c:3878 #, fuzzy msgid "" "The long line marker is a thin vertical line in the editor, it helps to mark " @@ -2300,11 +2321,11 @@ "виявити довгі рядки або нагадує почати з нового рядку. Встановлення сюди " "додатної величини створить цю межу на заданому стовпчику." -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Рядок" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 #, fuzzy msgid "" "Prints a vertical line in the editor window at the given cursor position " @@ -2313,11 +2334,11 @@ "Малювати вертикальну лінію у вікні редактору у позиції вказаній курсором " "(дивіться далі)." -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Фон" -#: ../src/interface.c:3846 +#: ../src/interface.c:3898 #, fuzzy msgid "" "The background color of characters after the given cursor position (see " @@ -2328,58 +2349,58 @@ "вказаного нижче кольору. (Радимо у випадку, якщо ви користуєтесь " "пропорціональними шрифтами)" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Деактивовано" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Межа довгого рядку" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Показати" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 #, fuzzy msgid "Default end of line characters:" msgstr "Кодування за замовчанням (для нових файлів):" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Нові файли" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 #, fuzzy msgid "Sets the default encoding for newly created files" msgstr "Встановити типове кодування для нових файлів." -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Кодування за замовчанням (для нових файлів):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Кодування за замовчанням (для існуючих файлів):" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "Оберіть кодування для відкриття існуючих файлів." -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Використовувати заздалегідь обране кодування для відкриття файлів" -#: ../src/interface.c:3978 +#: ../src/interface.c:4030 #, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " @@ -2390,81 +2411,81 @@ "відкриття а відкриває його за заздалегідь визначеним кодуванням (зазвичай не " "потрібно)." -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 #, fuzzy msgid "Encodings" msgstr "Кодування:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "Гарантувати чисту лінію у кінці файлу" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 msgid "Ensures that at the end of the file is a new line" msgstr "Гарантувати що у кінці файлу буде чиста лінія" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "Видалити пробіли після тексту" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Прибрати пробіли та відступи після тексту на кожному рядку" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Замінити відступи пробілами" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "Замінити усі відступи у документі пробілами." -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Зберігання файлів" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Довжина списку останніх файлів:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 #, fuzzy msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Задати кількість збережених посилань у списку останніх файлів." -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Файли" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Термінал:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Браузер:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "Тека та опції для інструменту make" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2472,25 +2493,25 @@ "Емулятор терміналу схожий на xterm, gnome-terminal або konsole (мусить " "обробляти аргумент -e)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" "Шлях (а також, по можливості, додаткові аргументи) до вашого улюбленого " "браузеру" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Виділення:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Теки інструментів" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2498,69 +2519,69 @@ "execution." msgstr "" -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Команди" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Інструменти" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "адреса електронної пошти розробника" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Ініціали ім'я розробника" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Початкова версія:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "Номер версії, що новий файл має з початку" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Назва компанії" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Розробник:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Компанія:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Поштова адреса:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Ініціали:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Ім'я розробника" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 #, fuzzy msgid "Year:" msgstr "Бічна панель:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 #, fuzzy msgid "Date:" msgstr "Make:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4382 +#: ../src/interface.c:4434 #, fuzzy msgid "" "Specify a format for the the {datetime} wildcard. You can use any conversion " @@ -2570,7 +2591,7 @@ "частини кожної сторінки. Ви можете використовувати будь яий формат що " "сумісний з ANSI C функцією strftime." -#: ../src/interface.c:4389 +#: ../src/interface.c:4441 #, fuzzy msgid "" "Specify a format for the the {year} wildcard. You can use any conversion " @@ -2580,7 +2601,7 @@ "частини кожної сторінки. Ви можете використовувати будь яий формат що " "сумісний з ANSI C функцією strftime." -#: ../src/interface.c:4396 +#: ../src/interface.c:4448 #, fuzzy msgid "" "Specify a format for the the {date} wildcard. You can use any conversion " @@ -2590,53 +2611,53 @@ "частини кожної сторінки. Ви можете використовувати будь яий формат що " "сумісний з ANSI C функцією strftime." -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Шаблонні дані" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Шаблони" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "_Змінити" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Гарячі клавіші" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Закріплення клавіш" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Команда:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, fuzzy, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "Команда для друку файлів (користуйтесь %f як назвою файлу)" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "Друкувати номера рядків" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 #, fuzzy msgid "Add line numbers to the printed page" msgstr "Додати номера рядків до друкуємої сторінки." -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "Друкувати номера рядків" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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." @@ -2644,11 +2665,11 @@ "Додати номера сторінок зверху кожної сторінки. Це буде забирати 2 рядка " "сторінки" -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "Роздрукувати титульну частину сторінки" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../src/interface.c:4575 ../src/printing.c:392 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2658,20 +2679,20 @@ "сторінки, назву файла та поточну дату(дивіться нижче). Це буде займати 3 " "рядки сторінки." -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "Використовувати базове ім'я друкованого файлу" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 #, fuzzy msgid "Print only the basename (without the path) of the printed file" msgstr "Друкувати лише назву (без шляху) друкуємого файлу." -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Формат дати:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2681,565 +2702,584 @@ "частини кожної сторінки. Ви можете використовувати будь яий формат що " "сумісний з ANSI C функцією strftime." -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Використовувати типове друкування GTK" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "Друкування" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Властивості проекту" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Файл" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Нове" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Відкрити" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Відкрити обраний файл" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Зберегти" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Зберегти усе" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Зберегти усе" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "Друкувати" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Зачинити" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Зачинити усе" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Перезавантажити усе" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 #, fuzzy msgid "Project" msgstr "_Проект" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Опції проекту" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Крок вперед" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Крок назад" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Подвоїти рядок або виділене" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Знищити поточний рядок(-ки)" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "Знищити поточний рядок(-ки)" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "Перемістити поточний рядок" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Переміститись до поточного рядку" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Перемістити огляд на 1 рядок вгору" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Перемістити огляд на 1 рядок вниз" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Довершений шматок" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Пов'язані дії" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Завершити слово" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Показати список макросів" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Вирізати" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Копіювати" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Вставити" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Копіювати поточний рядок(-ки)" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Вирізати поточний рядок(-ки)" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 #, fuzzy msgid "Select" msgstr "Виділити усе" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Виділити усе" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Виділити поточне слово" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Виділити поточний рядок(-ки)" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Виділити поточний параграф" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 #, fuzzy msgid "Format" msgstr "_Формат" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Закоментувати рядок(-ки)" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Розкоментувати рядок(-ки)" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Збільшити відступ" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Зменшити відступ" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Збільшити відступ на 1 символ" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Зменшити відступ на 1 рядок" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Надіслати до власної команди 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Надіслати до власної команди 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Надіслати до власної команди 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "_Надіслати виділене до" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 #, fuzzy msgid "Insert" msgstr "_Вставити" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Вставити дату" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 #, fuzzy msgid "Insert alternative white space" msgstr "Вставити альтернативний пробіл" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 #, fuzzy msgid "Settings" msgstr "Секції" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 #, fuzzy msgid "Search" msgstr "_Пошук" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Знайти" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Знайти наступне" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Знайти попереднє" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Знайти наступне виділення" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Знайти попереднє виділення" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Замінити" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Знайти у файлах" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Наступне повідомлення" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 #, fuzzy msgid "Previous Message" msgstr "Наступне повідомлення" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Користування пошуком" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 #, fuzzy msgid "Find Document Usage" msgstr "Користування пошуком" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "Виконати make для _усіх" + +#: ../src/keybindings.c:369 #, fuzzy msgid "Go to" msgstr "До рядку" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Перейти до попередньої локації" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Перейти до наступної локації" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Перейти до парної скоби" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Перейти до наступної мітки" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Перейти до попередньої мітки" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Перейти до визначення ярлика" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Перейти до об'яви ярлику" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 #, fuzzy msgid "Go to Start of Line" msgstr "До рядку" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 #, fuzzy msgid "Go to End of Line" msgstr "До рядку" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "До рядку" + +#: ../src/keybindings.c:400 #, fuzzy msgid "Go to Previous Word Part" msgstr "Перейти до попередньої мітки" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 #, fuzzy msgid "Go to Next Word Part" msgstr "Перейти до наступної мітки" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 #, fuzzy msgid "View" msgstr "_Показати" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Перемикач усіх додаткових віджетів" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "На весь екран" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Перемкнути бічну панель" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Наблизити" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Віддалити" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Перемнутися до редактору" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Перемкнутися до друку" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Перемкнутися до VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Перемкнутися до панелі пошуку" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 #, fuzzy msgid "Switch to Sidebar" msgstr "Перемкнутися до панелі пошуку" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 #, fuzzy msgid "Switch to Compiler" msgstr "Перемкнутися до панелі пошуку" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 #, fuzzy msgid "Notebook tab" msgstr "Команди вкладки блокноту" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Перемкнутися до документу зліва" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Перемкнутися до документу зправа" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Перемкнутися до останнього використаного документу" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Перемістити документ уліво" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Перемістити документ направо" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 #, fuzzy msgid "Move document first" msgstr "Переміститися до початку документу" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 #, fuzzy msgid "Move document last" msgstr "Переміститися до кінця документу" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 #, fuzzy msgid "Document" msgstr "_Документ" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 #, fuzzy msgid "Toggle Line wrapping" msgstr "Переніс рядку" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 #, fuzzy msgid "Toggle Line breaking" msgstr "_Перемикач закоментованості рядку" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 #, fuzzy msgid "Replace spaces by tabs" msgstr "_Заміняти відступи пробілами" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 #, fuzzy msgid "Toggle current fold" msgstr "Виділити поточне слово" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Згорнути усе" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Розгорнути усе" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Перезавантажити список сипмволів" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Побудувати" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Компілювати" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Виконати make над усим" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Виконати make над вказаним файлом" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Виконати make над об'єктом" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Наступна помилка" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 #, fuzzy msgid "Previous error" msgstr "Попередні перекладачі" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Виконати" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Виконати (альтернативна команда)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Опції побудови" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Показати палітру кольорів" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Допомога" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Гарячі клавіші" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "Наступні гарячі клавіші були налаштовані:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 #, fuzzy msgid "Switch to Document" msgstr "Перемкнутися до документу зліва" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Друкуйте тут усе що забажаєте і використовуйте це вікно для приміток або як " "чернетку" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "Помилка завантаження одного або більше файлів сесії." -#: ../src/log.c:177 +#: ../src/log.c:181 #, fuzzy msgid "Debug Messages" msgstr "Повідомлення" @@ -3297,7 +3337,7 @@ msgstr "Введіть префікс встановлення Geany" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "не завантажувати файл попередньої сесії" #: ../src/main.c:143 @@ -3312,24 +3352,24 @@ msgid "Show version and exit" msgstr "Показати версію та вийти" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[Файли...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3338,14 +3378,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3356,22 +3396,22 @@ "Можуть бути проблеми під час використання Geany без теки конфігурацій.\n" "Всеодно викликати Geany?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "Не знайдено файл '%s'." -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Це Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Тека конфігурацій не може бути створена (%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 #, fuzzy msgid "Configuration files reloaded." msgstr "Помилка під час компіляції." @@ -3389,19 +3429,19 @@ msgid "_Hide Message Window" msgstr "_Приховати вікно повідомлень" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 #, fuzzy msgid "_Plugin Manager" msgstr "Менеджер додатків" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3412,23 +3452,23 @@ "Опис: %s\n" "Автор(-и): %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Активно" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Додаток" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Не доступно жодного додатку." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Додатки" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3436,50 +3476,60 @@ "Нижче представлено список доступних додатків. Оберіть додатки що будуть " "завантажені під час запуску Geany." -#: ../src/plugins.c:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Деталі додатку:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Дія" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Опис" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Захопити комбінацію" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, fuzzy, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Задайте комбінацію клавіш, котру ви бажаєте використовувати для \"%s\"" -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +#, fuzzy +msgid "_Expand All" +msgstr "_Знайти усе" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +#, fuzzy +msgid "_Collapse All" +msgstr "_Закрити усе" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Дія" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Опис" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Обминути" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Обминути це закріплення клавіш?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Комбінація '%s' вже використовується для \"%s\"." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" "Вкажіть теки для інструменту нижче. Для інструментів, котрих ви не " "потребуєте залишіть пустим." #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3487,7 +3537,7 @@ "Встановіть інформацію для використання у шаблонах. Дивіться документацію для " "деталей." -#: ../src/prefs.c:1458 +#: ../src/prefs.c:1523 #, fuzzy msgid "" "Notice: For all changes you make here to take effect, you need to restart " @@ -3498,7 +3548,7 @@ "змін." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3510,7 +3560,7 @@ "закріплення." #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3519,61 +3569,62 @@ "побудований на версії GTK 2.10 (або вище) і якщо Geany виконується на " "GTK 2.10 (або вище)." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -#: ../src/printing.c:270 +#: ../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 "Сторінка %d з %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 #, fuzzy msgid "Document Setup" msgstr "Налаштування документу" -#: ../src/printing.c:375 +#: ../src/printing.c:410 #, fuzzy msgid "Print only the basename(without the path) of the printed file" msgstr "Друкувати лише назву (без шляху) друкуємого файлу." -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, fuzzy, c-format msgid "Page %d of %d" msgstr "Сторінка %d з %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Друкування \"%s\" було відмінено." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Файл %s надруковано." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "Друкування \"%s\" завершилося помилкою %s)." -#: ../src/printing.c:832 +#: ../src/printing.c:867 #, fuzzy msgid "Please set a print command in the preferences dialog first." msgstr "Спочатку будь-ласка вкажіть команду друку у діалозі налаштування" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3584,7 +3635,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Друкування \"%s\" завершилося помилкою (повернутий код: %s)." @@ -3603,154 +3654,154 @@ msgid "C_reate" msgstr "С_творити" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Назва:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Назва файлу:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Базова тека:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Оберіть базову теку проекту" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Файл проекту \"%s\" не може бути завантажено." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Відкрити проект" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Файли проекту" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Проект \"%s\" зачинено." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Опис:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Виконати make за базовим шляхом" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Виконати команду:" -#: ../src/project.c:457 +#: ../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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Зразки файлу:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "Ви дійсно бажаєте закрити це перед продовженням?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Проект '%s' вже відкрито." -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "Введене ім'я проекту занадто мале." -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Введене ім'я проекту занадто довге (максимально %d символів)." -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "Ви вказали неприпустиму назву файлу проекту." -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "Чи створити базову теку для проекту?" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Шлях \"%s\" не існує." -#: ../src/project.c:666 +#: ../src/project.c:670 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "Тека конфігурацій не може бути створена (%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Неможливо записати файл проекту (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Проект \"%s\" створено." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Проект \"%s\" збережено." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Вкажіть назву проекту" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "Вкажіть команду для виконання проекту" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Проект \"%s\" відкрито." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Використовувати _регулярні вирази" -#: ../src/search.c:205 +#: ../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:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "_Зворотній пошук" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Користуватися escape-_послідовністю" -#: ../src/search.c:231 +#: ../src/search.c:246 #, fuzzy msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " @@ -3759,403 +3810,413 @@ "Заміняти \\\\, \\t, \\n, \\r і \\uXXXX (символи Юнікоду) з відповідними " "керівними символами." -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "_Чутливе до регістру" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Співпадіння тільки _усього слова" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Співпадіння у _початку слова" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "_Попередній" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Наступний" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../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:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Знайти усе" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "_Виділити" -#: ../src/search.c:418 +#: ../src/search.c:433 #, fuzzy msgid "Mark all matches in the current document" msgstr "Виділити усі співпадіння у поточному документі." -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "У _сесії" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "У _документі" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Зачинити _діалог" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 #, fuzzy msgid "Disable this option to keep the dialog open" msgstr "Вимкнути цю опцію щоб залишити діалог відкритим." -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Знайти та за_мінити" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "_Змінити на:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "За_мінити усе" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "У _виділеному" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "Замінити усі співпадіння у виділеному тексті" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "_Тека:" -#: ../src/search.c:712 +#: ../src/search.c:727 #, fuzzy msgid "E_ncoding:" msgstr "Встановити кодовування:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "_Фіксований рядок" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Проявити _регулярний вираз" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "_Розширений регулярний вираз" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "_Рекурсія у внутрішніх теках" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "_Інвертувати результати пошуку" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "_Екстра опції:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 #, 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:1184 +#: ../src/search.c:1203 #, fuzzy, c-format msgid "Replaced text in %u file." msgid_plural "Replaced text in %u files." msgstr[0] "Замінити текст у %u файлах." msgstr[1] "Замінити текст у %u файлах." -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "Помилкова тека для пошуку файлів." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Немає тексту для пошуку." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" "Неможливо виконати інструмент виділення '%s'; перевірте шлях у налаштуваннях." -#: ../src/search.c:1400 +#: ../src/search.c:1419 #, fuzzy msgid "Searching..." msgstr "_Пошук" -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (у теці: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Не можу відкрити теку (%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Жодних співпадінь." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Частина" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Секція" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Секц1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Секц2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Секц3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Додаток" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Модуль" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../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:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Конструктори типів" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Секції" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Команда" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Середовище розробки" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Підрозділ" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Під-підрозділ" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Мітка" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 #, fuzzy msgid "Structures" msgstr "Статус" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Пакунок" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Моє" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Локальне" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Наше" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Константи" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 #, fuzzy msgid "ID Selectors" msgstr "У _виділеному" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 #, fuzzy msgid "Type Selectors" msgstr "Конструктори типів" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Модулі" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Одинаки" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Поля імен" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Налаштування" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Експортувати" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Члени" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Мітки" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Макроси" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 #, fuzzy msgid "Defines" msgstr "Рядків:" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Поля імен" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 #, fuzzy msgid "Structs" msgstr "Статус" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Незнайоме розширення файлу \"%s\".\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "Помилка створення файлу теґів.\n" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4164,7 +4225,7 @@ "Використання: %s -g <Файл ярликів> <Файл списку>\n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4175,178 +4236,186 @@ "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Завантажити ярлики" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Файл ярликів Geany (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Завантажено %s файл теґів '%s'." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Неможливо завантажити файл ярликів '%s'." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "Передовий опис \"%s\" не знайдено." -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Визначення \"%s\" не знайдено." -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "_Знайти усе" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "_Закрити усе" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Сортувати за _ім'ям" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Сортувати за _створенням" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Зберегти поточний файл" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "Зберегти _усі" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Зберегти усі відкриті файли" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Перезавантажити поточний файл з диску" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Закрити поточний файл" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 #, fuzzy msgid "Close all open files" msgstr "Закрити усі відкриті файли" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 #, fuzzy msgid "Cut the current selection" msgstr "Конвертувати вміст виділеного" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 #, fuzzy msgid "Copy the current selection" msgstr "Компілювати поточний файл" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 #, fuzzy msgid "Delete the current selection" msgstr "Конвертувати вміст виділеного" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Відмінити останню зміну" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Повторити відмінену зміну" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Компілювати поточний файл" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Виконати або відобразити поточний файл" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 #, fuzzy msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "Знайдіть потрібний колір користуючись вікном палітри кольорів." -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Збільшити розмір шрифту" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Зменшети розмір шрифту" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Зменшити відступ" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Збільшити відступ" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "Знайти уведений текст у поточному документі" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 #, fuzzy msgid "Jump to the entered line number" msgstr "Переміститися до введеного номеру ряду." -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Зачинити Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "документ XML" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "Виділити усі співпадіння у поточному документі." #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Створити новий файл" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Відкрити існуючий файл" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 #, fuzzy 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 "Показати" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4412,126 +4481,148 @@ msgid "Characters:" msgstr "Символів:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Не знайдено жодної вкладки" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Показати список _символів" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Показати список _документів" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Прибрати _бокову панель" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Показати _повний шлях з ім'ям" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "ряд: %d\t стов: %d\t обра: %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "RO " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "OVR" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "INS" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 #, fuzzy msgid "SP" msgstr "SP " -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "Встановити кодовування:" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, fuzzy, c-format msgid "filetype: %s" msgstr "Встановити тип файлу:" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "MOD" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Шрифт оновлений (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Стандартна бібліотека C" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Стандартна бібліотека C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Стандартна бібліотека C++" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "Вкажіть власний формат _часу" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Оберіть теку" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Оберіть файл" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 #, fuzzy msgid "C_onfiguration Files" msgstr "Помилка під час компіляції." -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +#, fuzzy +msgid "Save All" +msgstr "Зберегти _усі" + +#: ../src/ui_utils.c:1786 #, fuzzy 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 "Термінал" @@ -4706,163 +4797,147 @@ "Виконати програму у VTE замість відкриття у консольному вікні емуляції. Будь-" "ласка врахуйте, що програма котра виконується у VTE не може бути зупинена." -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Файли проекту Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Доступні для виконання" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Помилка" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Запитання" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Попередження" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Інформація" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Будівник класів" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "Створити файл-джерело для нових типів класів." -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Створити клас" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Клас" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Ім'я класу:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Керівний файл:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Файл-жерело:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Успадкування" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Базовий клас:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Базовий керівник:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Глобально" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Базовий GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Опції" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Створити конструктор" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Створити деструктор" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "тип конструктора GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Створити _Клас" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 #, fuzzy msgid "_C++ Class" msgstr "Клас C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 #, fuzzy msgid "_GTK+ Class" msgstr "Клас GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML символи" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Вставити HTML символ у вигляді '&'." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Команда розробників Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML символи" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Симоли кодування ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Грецькі символи" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Математичні символи" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Технічні символи" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Символи стрілки" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Пунктуаційні символи" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Інші символи" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Спеціальні символи" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "_Вставити" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4870,163 +4945,163 @@ "Оберіть спеціальний символ з поданого списку і подвійним натисканням або " "кнопкою вставки вставте його у поточну позицію курсору." -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Символ" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (назва)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Вс_тавити спеціальні HTML символи" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "Замінити" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Розташування нових вкладок з файлами:" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Вставити спеціальний HTML символ" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "Спеціальні символи" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Експортувати" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Експортувати поточний файл до іншого формату." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Експортувати файл" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "Використовувати _поточний ступінь масштабу" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 #, fuzzy msgid "" "Renders the font size of the document together with the current zoom level" msgstr "Змінювати розмір шрифту документу паралельно до масштабу." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Документ з успіхом експортовано як '%s'." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Файл '%s' неможливо записати (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' вже існує. Чи бажаєте замінити його?" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Експорт" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 #, fuzzy msgid "As _HTML" msgstr "Як HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 #, fuzzy msgid "As _LaTeX" msgstr "Як LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Оглядач файлів" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "Додати вкладку оглядача файлів до бічної панелі." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Занадто багато виділеного!" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Знайти у файлах" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "Показати при_ховані файли" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Вгору" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Перезавантажити" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Початок" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Вкажіть шлях до документу" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 #, fuzzy msgid "Clear the filter" msgstr "Закрити поточний файл" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 #, fuzzy msgid "Filter:" msgstr "Файл" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "Тека конфігурації додатку не може бути створена." @@ -5067,7 +5142,7 @@ #: ../plugins/filebrowser.c:1128 #, fuzzy -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "Чи створити базову теку для проекту?" #: ../plugins/filebrowser.c:1132 @@ -5075,32 +5150,32 @@ "Change the directory to the base directory of the currently opened project" msgstr "" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 #, fuzzy msgid "Save Actions" msgstr "Секції" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, fuzzy, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Тека конфігурацій не може бути створена (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, fuzzy, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Файл '%s' неможливо записати (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, fuzzy, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Не має змоги зупинити процес (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, fuzzy, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5108,110 +5183,125 @@ msgstr[1] "Автозбереження: збережено %d файлів автоматично." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 #, fuzzy msgid "Select Directory" msgstr "Виділити поточне слово" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "" -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Автоматичне збереження" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 #, fuzzy msgid "seconds" msgstr "%s команди" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 #, fuzzy msgid "_Print status message if files have been automatically saved" msgstr "Виводити повідомлення якщо файл був автоматично збережений" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 #, fuzzy msgid "Save only current open _file" msgstr "Зберегти тільки поточний файл" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 #, fuzzy msgid "Sa_ve all open files" msgstr "Зберегти усі відкриті файли" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 #, fuzzy msgid "Instant Save" msgstr "Вставити дату" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 #, fuzzy msgid "_Filetype to use for newly opened files:" msgstr "Встановити типове кодування для нових файлів." -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Виділити усі співпадіння у поточному документі." + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "" +#~ msgid "Diff file" +#~ msgstr "Diff файл" + +#, fuzzy +#~ msgid "reStructuredText file" +#~ msgstr "файл reStructuredText" + +#~ msgid "Select _All" +#~ msgstr "_Виділити усі" + #~ msgid "Failed to view %s (make sure it is already compiled)" #~ msgstr "Помилка відображення %s (впевніться, що воно вже скомпільовано)" @@ -5455,9 +5545,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "Структури / Типи" -#~ msgid "Show _Full Path Name" -#~ msgstr "Показати _повний шлях з ім'ям" - #~ msgid "Terminal emulation:" #~ msgstr "Емуляція терміналу:" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/vi.po /tmp/ssBwSf4GIv/geany-0.18/po/vi.po --- geany-0.17/po/vi.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/vi.po 2009-08-16 17:18:28.000000000 +0100 @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Geany 0.16\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2009-02-02 22:42+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -29,67 +29,67 @@ msgid "Integrated Development Environment" msgstr "Môi trường Phát triển Hợp nhất" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "Giới thiệu Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "Một IDE nhanh và nhẹ nhàng" -#: ../src/about.c:208 +#: ../src/about.c:210 #, 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:239 +#: ../src/about.c:241 msgid "Info" msgstr "Thông tin" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "Nhà phát triển" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "nhà duy trì" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "nhà phát triển" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "nhà duy trì bản dịch" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "Dịch giả" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "Dịch giả trước" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "Người đóng góp" -#: ../src/about.c:340 +#: ../src/about.c:342 #, 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:366 +#: ../src/about.c:368 msgid "Credits" msgstr "Công trạng" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "Giấy Phép" -#: ../src/about.c:389 +#: ../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." @@ -97,7 +97,7 @@ "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:219 ../src/build.c:769 +#: ../src/build.c:221 ../src/build.c:745 #, c-format msgid "" "Could not find terminal \"%s\" (check path for Terminal tool setting in " @@ -106,131 +106,131 @@ "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:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, 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:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "Tiến trình bị lỗi (%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (trong thư mục: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, 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:731 +#: ../src/build.c:707 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:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "Lỗi biên dịch." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "Mới biên dịch xong." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "Biên dị_ch" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 msgid "Make Custom _Target" msgstr "Make đích _riêng" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "Make đố_i tượng" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "Lỗi tiế_p" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "Lỗi t_rước" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "Đặt _Gồm và Đối số" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "Xem tập tin D_VI" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "Xem tập t_in PDF" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "Đặ_t đối số" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "Đặt đối số" -#: ../src/build.c:1326 +#: ../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:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "Tạo DVI:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "Tạo PDF:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "Xem thử DVI:" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "Xem thử PDF:" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -239,69 +239,69 @@ "%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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "Đặt đồ gồm và đối số" -#: ../src/build.c:1506 +#: ../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." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s lệnh" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "Biên dịch:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "Xây dựng:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "Thực hiện:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../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:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "Make đích riêng" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make 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 »." -#: ../src/build.c:1976 +#: ../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:1979 +#: ../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:1982 +#: ../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" -#: ../src/build.c:2044 +#: ../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:2082 +#: ../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)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../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." @@ -309,8 +309,8 @@ 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:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "Tải _lại" @@ -323,52 +323,52 @@ 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:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "Tới dòng" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "Nhập dòng cần tới:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 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:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "nn.tt.NNNN" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "tt.nn.NNNN" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "NNNN/tt/nn" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "nn.tt.NNNN GG:pp:gg" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "tt.nn.NNNN GG:pp:gg" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "NNNN/tt/nn GG:pp:gg" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "_Dùng định dạng ngày riêng" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "Định dạng ngày riêng" -#: ../src/callbacks.c:1495 +#: ../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." @@ -377,24 +377,24 @@ "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:1513 +#: ../src/callbacks.c:1516 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:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 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:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "Mở tập tin" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "_Xem" -#: ../src/dialogs.c:150 +#: ../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." @@ -402,29 +402,29 @@ "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:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "Phát hiện theo phần mở rộng tập tin" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "Phát hiện từ tập tin" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "Tùy chọn" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "_Hiện tập tin ẩn" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "Đặt bảng mã:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -439,11 +439,11 @@ "bảng mã đã chọn." #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "Đặt kiểu tập tin:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -455,23 +455,32 @@ "Ghi chú rằng nếu bạn chọn nhiều tập tin, tất cả các chúng sẽ được mở với " "kiểu tập tin đã chọn." -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "_Ghi đè" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "Lưu tập tin" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "Tha_y tên:" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "Lưu tập tin và thay tên nó" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "_Mở tập tin trên thẻ mới" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" @@ -479,129 +488,146 @@ "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:622 +#: ../src/dialogs.c:567 ../src/win32.c:562 +msgid "Error" +msgstr "Lỗi" + +#: ../src/dialogs.c:570 ../src/dialogs.c:1368 ../src/win32.c:568 +#: ../src/win32.c:627 +msgid "Question" +msgstr "Câu hỏi" + +#: ../src/dialogs.c:573 ../src/win32.c:574 +msgid "Warning" +msgstr "Cảnh báo" + +#: ../src/dialogs.c:576 ../src/win32.c:580 +msgid "Information" +msgstr "Thông tin" + +#: ../src/dialogs.c:656 msgid "_Don't save" msgstr "_Không lưu" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "Tập tin « %s » chưa được lưu." -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 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:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "Chọn phông" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 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:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "không rõ" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "Tài sản" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "Kiểu :" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "Cỡ :" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "Vị trí:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "Chỉ đọc:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(chỉ bên trong Geany)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "Bảng mã:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(có BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(không có BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "Sửa đổi:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "Đổi:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "Truy cập:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "Quyền hạn:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "Đọc:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "Ghi:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "Sở hữu :" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "Nhóm:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "Khác:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "Tập tin %s đã được đóng." -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "Tập tin mới « %s » đã được mở." -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "Không thể mở tập tin: %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -616,12 +642,12 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, 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:1030 +#: ../src/document.c:984 #, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " @@ -630,49 +656,52 @@ "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:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "Dấu cách" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "Thẻ" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Đang đặt chế độ thụt lề %s cho %s." -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "Tên tập tin không hợp lệ" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "Tập tin %s đã được tải lại." -#: ../src/document.c:1354 +#. 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 "Tập tin %s đã được mở (%d%s)." -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", chỉ đọc" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "Gặp lỗi khi lưu tập tin." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -681,7 +710,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:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -690,51 +719,51 @@ "Thông điệp lỗi: %s\n" "Lỗi xảy ra ở « %s » (dòng %d, cột %d)." -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "Thông điệp lỗi: %s." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "Gặp lỗi khi lưu tập tin." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "Gặp lỗi khi lưu tập tin (%s)." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "Tập tin %s đã được lưu." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "Không tìm thấy « %s »." -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "Cuộn qua việc tìm và tìm lại không?" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "Không tìm thấy cái nào tương ứng với « %s »." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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: mới thay thế %d lần gặp « %s » bằng « %s »." -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "Bạn có muốn tải lại nó không?" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -743,35 +772,20 @@ "Tập tin « %s » nằm trên đĩa là mới hơn\n" "bộ đệm hiện thời." -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "Thử lưu lại tập tin ?" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "Không tìm thấy tập tin « %s » trên đĩa." -# Literal: don't translate/Nghĩa chữ : đừng dịch -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -# Literal: don't translate/Nghĩa chữ : đừng dịch -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -# Literal: don't translate/Nghĩa chữ : đừng dịch -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "UNIX (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "Nhập chiều rộng của khoảng tab" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 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ế." @@ -873,134 +887,123 @@ msgstr "Tiếng Hoa truyền thống" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "Nhật" -#: ../src/encodings.c:141 ../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 "Triều Tiên" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "Không có bảng mã" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "Vùng Tâ_y Âu" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "Vùng Đôn_g Âu" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "_Vùng Đông Á" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "Vùng _Nam Đông và Nam Tay Á" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "Vùng T_rung Đông" # Name: don't translate / Tên: đừng dịch -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "Không có" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "Tập tin mã nguồn %s" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "Tập tin mã nguồn %s" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "Không có" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Tập tin tập lệnh trình bao" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Tập tin tạo ứng dụng (Makefile)" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "Tài liệu XML" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "Bảng kiểu dáng xếp tầng (CSS)" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "Tập tin đổ SQL" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "Tập tin khác biệt" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "Tập tin cấu hình" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Tập tin thông dịch Gettext" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "Tập tin văn lệnh %s" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "Tập tin reStructuredText" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "Ngôn ngữ _lập trình" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "Ngôn ngữ tạo _văn lệnh" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "Ngôn ngữ định _dạng" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "Ngôn ngữ l_inh tinh" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "Mọi mã nguồn" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "Mọi tập tin" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, 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:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "không tên" @@ -1014,8 +1017,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "vô hình" @@ -1023,7 +1026,7 @@ msgid "dummy tooltip, don't translate this." msgstr "dummy tooltip, don't translate this." -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "Mở tập t_in đã chọn" @@ -1043,11 +1046,11 @@ msgid "Page Set_up" msgstr "Thiết lập tr_ang" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "Đóng các tập tin k_hác" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "Đóng tất _cả" @@ -1055,84 +1058,80 @@ msgid "_Edit" msgstr "_Sửa" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "Chọn tất _cả" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "Định _dạng" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 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:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "Ghi _chú dòng" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "Hủy ghi chú dò_ng" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "Bật/_tắt ghi chú dòng" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../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:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "_Thụt lề thêm" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "Thụt lề _kém" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "_Gửi vùng chọn cho" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "_Gửi vùng chọn cho" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "Chè_n chú thích" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "_Chèn mục nhập ChangeLog" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "Chèn p_hần đầu tập tin" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "Chèn _mô tả hàm" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "Chèn _ghi chú đa dòng" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "Chèn thông báo _GPL" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "Chèn thông báo giấy phép _BSD" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "Chèn ngà_y" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "Chèn \"_include <...>\"" @@ -1157,7 +1156,7 @@ msgid "Find in F_iles" msgstr "Tìm trong tập t_in" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "Tha_y thế" @@ -1177,7 +1176,7 @@ msgid "Pr_evious Message" msgstr "Thông điệ_p trước" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "Tới dòn_g" @@ -1205,7 +1204,7 @@ msgid "Show Side_bar" msgstr "Hiện khung _lề" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "Trình soạn thảo" @@ -1249,15 +1248,15 @@ msgid "In_dent Type" msgstr "_Kiểu thụt lề" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "_Tab" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "_Dấu cách" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "T_ab và Dấu cách" @@ -1378,7 +1377,7 @@ msgid "_Debug Messages" msgstr "Thông điệp _Gỡ lỗi" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "Ký hiệu" @@ -1402,72 +1401,78 @@ msgid "Scribble" msgstr "Viết tháu" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "Ảnh _và Nhãn" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "_Chỉ ảnh" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "Chỉ _nhãn" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "Biểu tượng _lớn" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "Biểu tượng _nhỏ" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "Biểu tượng _nhỏ" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" msgstr "Ẩn t_hanh công cụ" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "Ẩn t_hanh công cụ" + +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "Tìm cách _sử dụng" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "Tìm cách sử _dụng tài liệu" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "_Tới lời xác định thẻ" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "Tớ_i lời tuyên bố thẻ" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "Hành _vị Ngữ cảnh" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "Tùy thích" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 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:2686 +#: ../src/interface.c:2706 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:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "Nạp hỗ trợ thiết bị cuối ảo" -#: ../src/interface.c:2690 +#: ../src/interface.c:2710 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1475,39 +1480,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:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "Bật hỗ trợ phần bổ sung" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "Khởi chạy" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "Lưu vị trí và dạng hình cửa sổ" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 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:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "Xác nhận thoát" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 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:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "Tắt máy" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "Đường dẫn khởi chạy:" -#: ../src/interface.c:2758 +#: ../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." @@ -1515,50 +1520,50 @@ "Đườ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:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "Tập tin dự án:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 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:2796 +#: ../src/interface.c:2816 #, fuzzy msgid "Extra plugin path:" msgstr "Bật hỗ trợ phần bổ sung" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "Đường dẫn" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "Khởi chạy" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 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:2851 +#: ../src/interface.c:2871 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:2853 +#: ../src/interface.c:2873 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:2856 +#: ../src/interface.c:2876 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" @@ -1566,11 +1571,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:2858 +#: ../src/interface.c:2878 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:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." @@ -1578,11 +1583,12 @@ "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:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +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:2866 +#: ../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 " @@ -1592,15 +1598,15 @@ "đượ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:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "Lặt vặt" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 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:2891 +#: ../src/interface.c:2911 msgid "" "Always wrap search around the document and hide the Find dialog after " "clicking Find Next/Previous" @@ -1608,11 +1614,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:2893 +#: ../src/interface.c:2913 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:2896 +#: ../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" @@ -1620,19 +1626,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:2898 +#: ../src/interface.c:2918 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:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "Tìm kiếm" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 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:2924 +#: ../src/interface.c:2944 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1640,11 +1646,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:2926 +#: ../src/interface.c:2946 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:2929 +#: ../src/interface.c:2949 #, fuzzy msgid "" "When enabled, a project file is stored by default inside the project base " @@ -1657,75 +1663,75 @@ "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" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "Dự án" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "Linh tinh" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "Chung" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "Hiện danh sách ký hiệu" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "Hiện/ẩn danh sách ký hiệu" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "Hiện danh sách tài liệu" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "Hiện/ẩn danh sách tài liệu" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "Khung lề" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "Danh sách ký hiệu :" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "Cửa sổ thông điệp:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "Bộ soạn thảo :" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "Đặt phông chữ cho cửa sổ thông điệp" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 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:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "Đặt phông soạn thảo" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "Phông" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "Hiện các thanh soạn thảo" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "Hiện nút Đóng" -#: ../src/interface.c:3064 +#: ../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)" @@ -1733,106 +1739,111 @@ "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:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "Vị trí thanh tập tin mới:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "Trái" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 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:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "Phải" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 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:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "Nhấn đôi thì ẩn mọi ô điều khiển bổ sung" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 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:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "Thẻ trình soạn thảo" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "Trên" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "Dưới" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "Khung lề:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "Vị trí thẻ" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "Hiện thanh trạng thái" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 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:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "Giao diện" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "Hiện thanh công cụ" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "Thanh công cụ" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "Kiểu biểu tượng:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "Cỡ biểu tượng:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "Diện mạo" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "Hiện _thanh công cụ" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "Thanh công cụ" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "Ngắt dòng" -#: ../src/interface.c:3349 +#: ../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 " @@ -1842,11 +1853,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:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "Bật phím Home khéo" -#: ../src/interface.c:3354 +#: ../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 " @@ -1859,11 +1870,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:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "Tắt Kéo và Thả" -#: ../src/interface.c:3359 +#: ../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" @@ -1871,19 +1882,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:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "Bật gấp lại" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "Có nên bật gấp lại mã hay không" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 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:3369 +#: ../src/interface.c:3413 #, fuzzy msgid "" "Fold or unfold all children of a fold point. By pressing the Shift key while " @@ -1892,11 +1903,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:3371 +#: ../src/interface.c:3415 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:3374 +#: ../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" @@ -1904,23 +1915,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:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "Dòng mới bỏ dấu cách theo sau" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 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:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "Cột ngắt dòng:" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "Dấu bật/tắt ghi chú :" -#: ../src/interface.c:3406 +#: ../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." @@ -1928,68 +1939,68 @@ "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:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "Tính năng" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "Tính năng" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "Chế độ tự động thụt lề:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "Cơ bản" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "Ký tự hiện thời" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "Khớp dấu ngoặc móc" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "Kiểu :" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "Rộng:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 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:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "Dùng dấu cách khi chèn khoảng thụt lề" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "Thụt lề theo một khoảng tab" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" "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:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "Rộng tab cứng:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" @@ -1997,30 +2008,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:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "Thụt lề phím Tab" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 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:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "Thụt lề" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "Thụt lề" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "Làm xong đoạn" -#: ../src/interface.c:3581 +#: ../src/interface.c:3625 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" @@ -2028,19 +2039,20 @@ "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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "Tự động điền nốt thẻ XML" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 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:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "Tự động tiếp tục ghi chú đa dòng" -#: ../src/interface.c:3591 +#: ../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" @@ -2048,11 +2060,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:3593 -msgid "Automatic symbol completion" -msgstr "Tự động gõ xong ký hiệu" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" @@ -2060,91 +2072,103 @@ "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:3604 +#: ../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 "Số tối đa các góp ý tên ký hiệu :" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "Bề cao danh sách điền nốt:" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "Ký tự cần gõ để làm xong:" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 +#, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"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:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +#, fuzzy +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:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +#, fuzzy +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:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "Làm xong" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "Ngoặc đơn ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 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:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "Nháy đơn ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 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:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "Ngoặc móc { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 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:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "Ngoặc vuông [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 #, fuzzy 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ở" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "Nháy kép \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 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:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "Tự động điền nốt Nháy và Ngoặc" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "Mục điền nốt" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "Đảo ngược màu sắc tô sáng cú pháp" -#: ../src/interface.c:3738 +#: ../src/interface.c:3790 msgid "" "Use white text on a black background and invert all colors, this option " "requires a restart of Geany" @@ -2152,79 +2176,79 @@ "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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "Hiện nét dẫn thụt lề" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 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:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "Hiện khoảng trắng" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 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:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "Hiện kết thúc dòng" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "Hiện ký tự kết thúc dòng" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "Hiện số thứ tự dòng" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "Hiện/ẩn lề số thứ tự dòng" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "Hiện lề đánh dấu" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 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:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "Dừng cuộn ở dòng cuối" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 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:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "Hiển thị" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "Dấu dòng dài:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "Màu dấu dòng dài:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "Đặt màu của dấu dòng dài" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "Bộ chọn màu" -#: ../src/interface.c:3826 +#: ../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 " @@ -2234,11 +2258,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:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "Dòng" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" @@ -2246,11 +2270,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:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "Nền" -#: ../src/interface.c:3846 +#: ../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 " @@ -2259,55 +2283,55 @@ "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:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "Bị tắt" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "Dấu dòng dài" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "Hiển thị" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "Mở tài liệu mới từ dòng lệnh" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 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:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "Ký tự kết thúc dòng mặc định:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "Tập tin mới" -#: ../src/interface.c:3942 +#: ../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:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "Bảng mã mặc định (tập tin mới):" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "Bảng mã mặc định (tập tin đã có):" -#: ../src/interface.c:3967 +#: ../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:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "Dùng bảng mã cố định khi mở tập tin" -#: ../src/interface.c:3978 +#: ../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 " @@ -2316,52 +2340,52 @@ "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:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "Bảng mã" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 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:4002 +#: ../src/interface.c:4054 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:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "Bỏ dấu cách và Tab theo sau" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 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:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "Thay thế các tab bằng dấu cách" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 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:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "Lưu tập tin" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "Độ dài danh sách tập tin gần đây:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 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:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "Thời hạn kiểm tra đĩa:" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." @@ -2369,28 +2393,28 @@ "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:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "Tập tin" # Name: don't translate/Tên: đừng dịch -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "Make:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "Thiết bị cuối:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "Bộ duyệt:" -#: ../src/interface.c:4138 +#: ../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:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" @@ -2398,24 +2422,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:4152 +#: ../src/interface.c:4204 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:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "Đường dẫn công cụ" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "Hành động ngữ cảnh:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2426,67 +2450,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:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "Lệnh" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "Công cụ" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "địa chỉ thư của nhà phát triển" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "Tên tắt của nhà phát triển" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "Phiên bản đầu tiên:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 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:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "Tên công ty" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "Nhà phát triển:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "Công ty:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "Địa chỉ bưu điện:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "Tên tắt:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "Tên của nhà phát triển" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "Năm:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "Ngày:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "Ngày Giờ :" -#: ../src/interface.c:4382 +#: ../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." @@ -2494,7 +2518,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:4389 +#: ../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." @@ -2502,7 +2526,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:4396 +#: ../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." @@ -2510,62 +2534,62 @@ "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:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "Dữ liệu mẫu" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "Biểu mẫu" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "Đổ_i" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "Phím tắt" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "Tổ hợp phím" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "Lệnh:" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, 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:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "Dùng lệnh bên ngoài để in" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "In số thứ tự dòng" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 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:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "In số thứ tự trang" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "Thêm số thứ tự dòng vào đáy từng trang (chiếm 2 dòng)" -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "In phần đầu trang" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../src/interface.c:4575 ../src/printing.c:392 #, fuzzy msgid "" "Add a little header to every page containing the page number, the filename " @@ -2574,20 +2598,20 @@ "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:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 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:4543 +#: ../src/interface.c:4595 #, fuzzy 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/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "Định dạng ngày tháng:" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2597,536 +2621,556 @@ "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:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "Dùng chức năng in GTK sở hữu" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "In" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "Tài sản dự án" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "Tập tin" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "Mới" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "Mở" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "Mở tập tin đã chọn" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "Lưu" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "Lưu dạng" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "Lưu tất cả" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "In" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "Đóng" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "Đóng tất cả" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "Tải lại tập tin" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "Dự án" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "Tài sản dự án" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "Hủy bước" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "Bước lại" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "Nhân đôi dòng hay vùng chọn" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "Xoá các dòng hiện tại" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +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" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "Cuộn đến dòng hiện tại" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "Cuộn lên một dòng" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "Cuộn xuống một dòng" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "Làm xong đoạn" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "Chuyển con trỏ trong đoạn" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "Tắt chức năng làm xong đoạn" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "Hành động ngữ cảnh" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "Gõ xong từ" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "Hiện mẹo gọi" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "Hiện danh sách vĩ lệnh" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "Bảng nháp" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "Cắt" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "Chép" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "Dán" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "Chép các dòng hiện tại" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "Cắt các dòng hiện tại" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "Chọn" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "Chọn tất cả" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "Chọn từ hiện thời" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "Chọn các dòng hiện tại" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "Chọn đoạn văn hiện tại" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "Định dạng" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "Chuyển đổi chữ hoa/thường của vùng chọn" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "Bật/tắt ghi chú dòng" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "Ghi chú dòng" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "Hủy ghi chú dòng" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "Thụt lề thêm" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "Thụt lề kém" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "Thụt lề thêm một dấu cách" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "Thụt lề kém một dấu cách" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "Thụt lề dòng khéo" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "Gửi cho Lệnh riêng 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "Gửi cho Lệnh riêng 1" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "Gửi cho Lệnh riêng 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "_Gửi vùng chọn cho" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "Chèn" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "Chèn ngày" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "Chèn khoảng trắng xen kẽ" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "Thiết lập" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "Tìm kiếm" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "Tìm" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "Tìm kế" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "Tìm trước" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "Tìm vùng chọn kế" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "Tìm vùng chọn trước" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "Thay thế" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "Tìm trong tập tin" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "Thông điệp kế" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "Thông điệp trước" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "Tìm cách sử dụng" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "Tìm cách sử dụng tài liệu" -#: ../src/keybindings.c:360 +# Literal: don't translate/Nghĩa chữ : đừng dịch +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "_Make All" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "Đi tới" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "Duyệt ngược một vị trí" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "Duyệt tới một vị trí" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "Tới dấu ngoặc móc khớp" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "Dấu bật/tắt" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "Tới dấu kế" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "Về dấu trước" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "Tới lời xác định thẻ" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "Tới lời tuyên bố thẻ" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "Tới đầu dòng" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "Tới cuối dòng" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "Tới cuối dòng" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "Về phần từ trước" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "Tới phần từ tiếp" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "Xem" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "Bật/tắt mọi ô điều khiển thêm" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "Toàn màn hình" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "Hiện/ẩn cửa sổ thông điệp" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "Hiện/ẩn khung lề" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "Phóng to" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "Thu nhỏ" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "Tập trung" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "Chuyển sang bộ soạn thảo" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "Chuyển sang Viết tháu" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "Chuyển sang VTE" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "Chuyển sang Thanh tìm" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "Chuyển sang Khung lề" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "Chuyển sang Bộ biên dịch" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "Thẻ cuốn vở" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "Chuyển dang tài liệu bên trái" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "Chuyển dang tài liệu bên phải" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "Chuyển sang tài liệu dùng cuối" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "Dời tài liệu qua bên trái" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "Dời tài liệu qua bên phải" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "Dời tài liệu trên đầu" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "Dời tài liệu xuống cuối" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "Tài liệu" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "Bật/tắt cuộn dòng" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "Bật/tắt ngắt dòng" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "Thay thế bằng tab các dấu cách" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "Bật/tắt phần gấp hiện thời" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "Gấp tất cả" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "Mở lại tất cả" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "Tải lại danh sách ký hiệu" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "Xây dựng" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "Biên dịch" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "Make đích riêng" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "Make đối tượng" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "Lỗi kế" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "Lỗi trước" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "Chạy" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "Chạy (lệnh xen kẽ)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "Tùy chọn xây dựng" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "Hiện bảng chọn màu" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "Trợ giúp" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "Phím tắt" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 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:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "Chuyển sang Tài liệu" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 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:1001 +#: ../src/keyfile.c:1015 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." -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "Thông điệp Gỡ lỗi" @@ -3183,8 +3227,8 @@ msgstr "In tiền tố cài đặt của Geany" #: ../src/main.c:141 -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" +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 msgid "Don't load terminal support" @@ -3198,24 +3242,24 @@ msgid "Show version and exit" msgstr "Hiện phiên bản rồi thoát" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[TẬP_TIN...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "Chuyển nó ngay ?" -#: ../src/main.c:633 +#: ../src/main.c:594 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:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3224,7 +3268,7 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../src/main.c:613 #, c-format msgid "" "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " @@ -3233,7 +3277,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:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3244,22 +3288,22 @@ "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:816 ../src/socket.c:164 +#: ../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:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "Đây là Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, 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:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "Các tập tin cấu hình đã được nạp lại." @@ -3275,7 +3319,7 @@ msgid "_Hide Message Window" msgstr "Ẩn cửa sổ t_hông điệp" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " @@ -3284,11 +3328,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:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "Quản lý _Phần bổ sung" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3299,23 +3343,23 @@ "Mô tả: %s\n" "Tác giả: %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "Hoạt động" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "Phần bổ sung" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "Không có phần bổ sung sẵn sàng." -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "Phần bổ sung" -#: ../src/plugins.c:1263 +#: ../src/plugins.c:1250 msgid "" "Below is a list of available plugins. Select the plugins which should be " "loaded when Geany is started." @@ -3323,48 +3367,56 @@ "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:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "Chi tiết về Phần bổ sung" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "Hành động" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "Phím tắt" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "Bắt phím" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, 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:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "Giãn _ra tất cả" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "_Co lại tất cả" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "Hành động" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "Phím tắt" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "_Ghi đè" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "Ghi đè lên tổ hợp phím đó không?" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Tổ hợp « %s » đã được dùng cho « %s »." #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 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:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." @@ -3372,7 +3424,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:1458 +#: ../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." @@ -3383,7 +3435,7 @@ "hình." #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3394,7 +3446,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:1469 +#: ../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)." @@ -3402,17 +3454,8 @@ "Chức năng in GTK sở hữu chỉ sẵn sàng nếu Geany đã được xây dựng đối với " "GTK 2.10 (hay sau) và Geany đang chạy với GTK 2.10 (hay sau)." -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -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." - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." @@ -3420,45 +3463,53 @@ "Cảnh báo : thiết lập này bị dự án hiện thời ghi đè. Xem Dự án > Thuộc " "tính." -#: ../src/printing.c:270 +#: ../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 "Trang %d trên %d" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "Thiết lập Tài liệu" -#: ../src/printing.c:375 +#: ../src/printing.c:410 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:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "Trang %d trên %d" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "Tiến trình in tập tin %s bị thôi." -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "Tập tin %s đã được in." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, 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:832 +#: ../src/printing.c:867 #, fuzzy 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." -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3469,7 +3520,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Lỗi in « %s » (mã trả lại: %s)." @@ -3489,19 +3540,19 @@ msgstr "Tạ_o" # Name: don't translate/Tên: đừng dịch -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "Tên:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "Tên tập tin:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "Đường dẫn cơ bản:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3511,41 +3562,41 @@ "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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "Chọn đường dẫn cơ bản dự án" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, 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:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "Mở dự án" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "Tập tin dự án" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "Dự án « %s » đã được đóng." -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "Mô tả:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "Tạo trên đường dẫn cơ bản" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "Chạy lệnh:" -#: ../src/project.c:457 +#: ../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." @@ -3553,81 +3604,81 @@ "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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "Mẫu tập tin:" -#: ../src/project.c:574 +#: ../src/project.c:578 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:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "Dự án « %s » đã mở." -#: ../src/project.c:619 +#: ../src/project.c:623 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:625 +#: ../src/project.c:629 #, 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:633 +#: ../src/project.c:637 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:656 +#: ../src/project.c:660 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:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "Đường dẫn « %s » không tồn tại." -#: ../src/project.c:666 +#: ../src/project.c:670 #, 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:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "Không thể ghi tập tin dự án (%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "Dự án « %s » đã được tạo." -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "Dự án « %s » đã được lưu." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "Chọn tên tập tin dự án" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../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:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "Dự án « %s » đã được mở." -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "Dùng biể_u thức chính quy" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." @@ -3635,15 +3686,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:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "Tìm n_gược" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "Dùng chuỗi t_hoát" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" @@ -3651,393 +3702,403 @@ "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:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "Phân biệt chữ ho_a/thường" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "Khớp chỉ t_oàn từ" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "Khớp _từ đầu từ" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "T_rước" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "_Kế" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "Tìm _kiếm:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "_Tìm tất cả" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "Đánh _dấu" -#: ../src/search.c:418 +#: ../src/search.c:433 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:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "Tr_ong phiên chạy" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "Trong tà_i liệu" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "Đóng _hộp thoại" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 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:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "Thay thế _và Tìm:" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "T_hay thế bằng:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "Tha_y thế tất cả" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "Trong _vùng chọn" -#: ../src/search.c:592 +#: ../src/search.c:607 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:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "Thư _mục:" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "Bả_ng mã:" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "Chuỗi đã _sửa chữa" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "Biểu thức chính quy kiểu _grep" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 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:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "Biểu thức chính quy đã _mở rộng" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "Đệ qui t_rong thư mục con" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "Đảo kết quả tìm k_iếm" -#: ../src/search.c:782 +#: ../src/search.c:797 #, fuzzy 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." -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "Tù_y chọn thêm:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "Tùy chọn khác cần gửi cho Grep" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "Tìm %d mục tương ứng với « %s »." -#: ../src/search.c:1184 +#: ../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:1285 +#: ../src/search.c:1304 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:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "Không có đoạn cần tìm." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, 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:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "Đang tìm kiếm..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (trong thư mục: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "Không thể mở thư mục (%s)" -#: ../src/search.c:1546 +#: ../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:1567 +#: ../src/search.c:1586 #, 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:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "Không tìm thấy." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "Chương" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "Phần" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "Phần 1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "Phần 2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "Phần 3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "Phụ lục" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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 "Khác" -#: ../src/symbols.c:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "Mô-đun" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 msgid "Types" msgstr "Kiểu" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "Hàm tạo kiểu" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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 "Hàm" -#: ../src/symbols.c:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "Phần" -#: ../src/symbols.c:602 +#: ../src/symbols.c:618 msgid "Keys" msgstr "Khoá" #. &(tv_iters.tag_class), _("Constants"), #. &(tv_iters.tag_member), _("Members"), #. &(tv_iters.tag_macro), _("Macros"), -#: ../src/symbols.c:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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 "Biến" -#: ../src/symbols.c:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "Lệnh" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "Môi trường" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "Phần phụ" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "Phần phụ con" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "Nhãn" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "Cấu trúc" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "Gói" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "Tôi" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "Cục bộ" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "Chúng ta" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../src/symbols.c:667 ../src/symbols.c:763 ../src/symbols.c:777 +#: ../src/symbols.c:790 ../src/symbols.c:816 msgid "Interfaces" msgstr "Giao diện" -#: ../src/symbols.c:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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 "Hạng" -#: ../src/symbols.c:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "Hằng" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "Neo" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "Tiêu đề H1" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "Tiêu đề H2" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "Tiêu đề H3" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "Bộ chọn ID" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "Bộ chọn kiểu" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "Mô-đun" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "Vật đơn" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../src/symbols.c:713 ../src/symbols.c:724 ../src/symbols.c:733 +#: ../src/symbols.c:765 ../src/symbols.c:792 msgid "Methods" msgstr "Phương pháp" -#: ../src/symbols.c:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "Miền tên" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "Tài sản" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "Xuất" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "Bộ phạn" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "Nhãn" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "Thường trình con" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "Khối" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "Vĩ lệnh" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "Xác định" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "Đích" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "Miền tên" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "Struct" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "Typedef / Enum" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, 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:1328 +#: ../src/symbols.c:1358 #, 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:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -4046,7 +4107,7 @@ "Cách sử dụng: %s -g \n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4057,170 +4118,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "Nạp thẻ" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 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:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "Mới nạp tập tin thẻ %s « %s »." -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "Không thể nạp tập tin thẻ « %s »." -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, 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:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "Không tìm thấy lời xác định « %s »." -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "Giãn _ra tất cả" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "_Co lại tất cả" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "Sắp xếp theo Tê_n" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "Sắp xếp theo _Diện mạo" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "Lưu tập tin hiện thời" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "Lưu tất cả" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "Lưu mọi tập tin đang mở" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "Tải lại tập tin hiện thời từ đĩa" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "Đóng tập tin hiện thời" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "Đóng mọi tập tin còn mở" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "Cắt vùng chọn hiện thời" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "Chép vùng chọn hiện thời" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "Dán nội dung của bảng nháp" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "Xoá vùng chọn hiện thời" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "Hủy bước sự sửa đổi cuối cùng" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "Bước lại sự sửa đổi cuối cùng" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "Biên dịch tập tin hiện thời" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "Chạy hay xem tập tin hiện thời" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 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:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "Phóng to đoạn" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "Thu nhỏ đoạn" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "Giảm khoảng thụt lề" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "Tăng khoảng thụt lề" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 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:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "Nhảy tới số thứ tự dòng đã nhập" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "Hiển thị hộp thoại Tùy thích" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "Thoát Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "Tài liệu XML" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -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." +#: ../src/toolbar.c:80 +#, fuzzy +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" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "Tạo tập tin mới" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "Mở tập tin đã có" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 msgid "Goto" msgstr "Đi tới" +#: ../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 "Hiển thị" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4289,125 +4359,149 @@ msgid "Characters:" msgstr "Ký tự :" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "Không tìm thấy thẻ" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "Hiện danh sách _Ký hiệu" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "Hiện _danh sách Tài liệu" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "Ẩ_n khung lề" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "Hiện thanh trạng thái" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "CĐ " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "ĐÈ" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "CHÈN" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "TAB" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "SP" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "T/S" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "chế độ : %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "bảng mã: %s: %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "dạng tập tin: %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "SỬA" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "phạm vi: %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "Phông chữ đã được cập nhật (%s)." -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "Thư Viện Chuẩn C" # Name: don't translate/Tên: đừng dịch -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (Thư Viện Chuẩn C)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "Thư Viện Chuẩn C++" # Name: don't translate/Tên: đừng dịch -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "Đặt định dạng ngày _riêng" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "Chọn thư mục" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "Chọn tập tin" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "Tập tin Cấ_u hình" -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +msgid "Save All" +msgstr "Lưu tất cả" + +#: ../src/ui_utils.c:1786 msgid "Close All" msgstr "Đóng tất cả" +# Literal: don't translate/Nghĩa chữ : đừng dịch +#: ../src/utils.c:324 +msgid "Win (CRLF)" +msgstr "Win (CRLF)" + +# Literal: don't translate/Nghĩa chữ : đừng dịch +#: ../src/utils.c:325 +msgid "Mac (CR)" +msgstr "Mac (CR)" + +# Literal: don't translate/Nghĩa chữ : đừng dịch +#: ../src/utils.c:326 +msgid "Unix (LF)" +msgstr "UNIX (LF)" + #: ../src/vte.c:301 ../src/vte.c:726 msgid "Terminal" msgstr "Thiết bị cuối" @@ -4573,161 +4667,145 @@ "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:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Tập tin dự án Geany" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "Tập tin có thể chạy" -#: ../src/win32.c:575 -msgid "Error" -msgstr "Lỗi" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "Câu hỏi" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "Cảnh báo" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "Thông tin" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "Bộ xây dựng hạng" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 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:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "Tạo hạng" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "Hạng" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "Tên hạng:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "Tập tin phần đầu :" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "Tập tin mã nguồn:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "Kế thừa" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "Hạng cơ bản:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "Phần đầu cơ bản:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "Toàn cục" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "Kiểu GType cơ bản:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "Tùy chọn" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "Tạo hàm tạo dựng" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "Tạo hàm phá hủy" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "Kiểu hàm tạo GTK+" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "Tạo _hạng" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "Hạng _C++" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "Hạng _GTK+" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "Ký tự HTML" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "Chèn thực thể ký tự HTML như « & »." -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Nhóm nhà phát triển Geany" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "Ký tự HTML" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "Ký tự ISO 8859-1" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "Ký tự Hy-lạp" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "Ký tự toán học" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "Ký tự kỹ thuật" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "Ký tự mũi tên" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "Ký tự dấu chấm câu" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "Ký tự lặt vặt" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "Ký tự Đặc biệt" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "C_hèn" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4735,160 +4813,160 @@ "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:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "Ký tự" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML (tên)" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "Chèn ký tự HTML đặc b_iệt" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "Thay thế" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 #, fuzzy msgid "Bulk replacement of special chars" msgstr "Vị trí thanh tập tin mới:" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "Chèn ký tự HTML đặc biệt" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "Ký tự Đặc biệt" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 #, fuzzy msgid "Toggle plugin status" msgstr "Bật/tắt ghi chú dòng" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "Xuất" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "Xuất khẩu tập tin hiện tại ra định dạng khác nhau." -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "Xuất tập tin" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "Dùng hệ số th_u phóng hiện thời" -#: ../plugins/export.c:193 +#: ../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." -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "Tài liệu đã được xuất khẩu theo « %s »." -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "Không thể ghi tập tin « %s » (%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, 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:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "_Xuất" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "Theo _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "Theo _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "Bộ duyệt qua tập tin" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 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." -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "Chọn quá nhiều mục !" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, 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:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "Mở _bên ngoài" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "_Tìm trong tập tin" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "_Hiện tập tin ẩn" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "Lên" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "Cập nhật" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "Nhà" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "Đặt đường dẫn dựa vào tài liệu" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "Xoá sạch bộ lọc" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "Bộ lọc:" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "Danh sách Tập tin Tập trung" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "Mục nhập Đường dẫn Tập trung" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../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." @@ -4928,7 +5006,8 @@ "(bao gồm *.o, *.obj. *.so, *.dll, *.a, *.lib)" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" +#, fuzzy +msgid "Use the project's base directory" msgstr "Đặt thư mục cơ bản của dự án" #: ../plugins/filebrowser.c:1132 @@ -4936,139 +5015,170 @@ "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" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "Hành vi Lưu" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" "Phần bổ sung này cung cấp các hành vi khác nhau liên quan đến lưu tập tin." -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "Bản sao lưu : không thể tạo thư mục (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "Bản sao lưu : không thể đọc tập tin (%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "Bản sao lưu : không thể lưu tập tin (%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." msgstr[0] "Tự động lưu : %d tập tin đã được tự động lưu." #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "Chọn thư mục" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "Thư mục sao lưu không tồn tại hoặc không cho phép ghi." -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "Tự động lưu" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "_Bật" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "_Khoảng tự động lưu :" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "giây" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "In thông điệ_p trạng thái nếu tập tin đã được tự động lưu" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "Lư_u chỉ tập tin còn mở hiện tại" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "Lưu _mọi tập tin còn mở" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "Lưu ngày" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "_Dạng tập tin cần dùng cho tập tin mới mở :" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "Bản sao lưu" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "Thư _mục vào đó cần lưu tập tin sao lưu :" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" "Định dạng Ngày/_Giờ cho tập tin sao lưu (« man strftime » để tìm chi tiết):" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "_Các cấp thư mục cần bao gồm trong đích đến sao lưu :" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "Tách cửa sổ" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 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:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "Đánh dấu mọi mục khớp trong tài liệu hiện thời" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "_Bỏ tách" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "Tách cửa _sổ" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "_Ngang" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "_Dọc" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 #, fuzzy msgid "Split Horizontally" msgstr "_Ngang" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 #, fuzzy msgid "Split Vertically" msgstr "_Dọc" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 #, fuzzy msgid "Unsplit" msgstr "_Bỏ tách" +#~ msgid "Diff file" +#~ msgstr "Tập tin khác biệt" + +#~ msgid "reStructuredText file" +#~ msgstr "Tập tin reStructuredText" + +#~ msgid "Select _All" +#~ msgstr "Chọn tất _cả" + +#~ msgid "Automatic symbol completion" +#~ msgstr "Tự động gõ xong ký hiệu" + +#~ msgid "" +#~ "Notice: To customize the toolbar elements, edit the file 'ui_toolbar." +#~ "xml'. Please see the documentation for details." +#~ 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." + +#~ msgid "" +#~ "For all changes you make in this file to take effect, you need to restart " +#~ "Geany." +#~ 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." + #~ 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)" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/zh_CN.po /tmp/ssBwSf4GIv/geany-0.18/po/zh_CN.po --- geany-0.17/po/zh_CN.po 2009-04-25 09:31:46.000000000 +0100 +++ geany-0.18/po/zh_CN.po 2009-08-16 17:18:28.000000000 +0100 @@ -6,9 +6,9 @@ # Dormouse Young , 2006-2008, 2009. msgid "" msgstr "" -"Project-Id-Version: Geany 0.17\n" +"Project-Id-Version: Geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\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" @@ -30,203 +30,203 @@ msgid "Integrated Development Environment" msgstr "集成开发环境" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "关于 Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "一个轻快的IDE" -#: ../src/about.c:208 +#: ../src/about.c:210 #, c-format msgid "(built on or after %s)" msgstr "(基于%s生成或之后)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "信息" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "开发人员" -#: ../src/about.c:264 +#: ../src/about.c:266 msgid "maintainer" msgstr "主管" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "开发" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "翻译" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "翻译者" -#: ../src/about.c:309 +#: ../src/about.c:311 msgid "Previous Translators" msgstr "前译者" -#: ../src/about.c:330 +#: ../src/about.c:332 msgid "Contributors" msgstr "贡献者" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "一部分贡献者（详细清单参见文件 %s ）" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "荣誉" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "许可条款" -#: ../src/about.c:389 +#: ../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 "" "许可条款未找到，请到 http://www.gnu.org/licenses/gpl-2.0.txt 在线查看。" -#: ../src/build.c:219 ../src/build.c:769 +#: ../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 "无法找到虚拟终端“'%s” (请检查在首选项中的路径设置)" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "执行 %s 失败(开始代码无法创建)" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "进程失败(%s)" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s (在目录%s中)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "改变工作路径到 \"%s\" 失败" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "因为文件中可能含有命令所以无法在虚拟终端中执行这个文件" -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "编译失败" -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "编译成功结束。" #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "编译(_C)" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../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:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 msgid "Make _Object" msgstr "生成目标文件(_O)" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 msgid "_Next Error" msgstr "下一个错误(_N)" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 msgid "_Previous Error" msgstr "前一个错误(_P)" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "设置编译参数(_S)" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "LaTeX -> _DVI" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "LaTeX -> _PDF" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 msgid "_View DVI File" msgstr "查看DVI文件(_V)" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 msgid "V_iew PDF File" msgstr "查看PDF文件(_I)" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 msgid "_Set Arguments" msgstr "设置参数(_S)" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "设置参数" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "为编译和查看(La)TeX文件设置程序和参数" -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "DVI生成:" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "PDF生成:" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "DVI预览" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "PDF预览" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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" @@ -235,67 +235,67 @@ "%f 会被替换为当前文件名，如： test_file.c\n" "%e 会被替换为没有扩展名的当前文件名如. test_file" -#: ../src/build.c:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "设置包含和参数" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "设置生成命令并运行程序" #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, c-format msgid "%s commands" msgstr "%s 命令" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "编译:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "生成:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "执行:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 msgid "Build the current file" msgstr "生成当前文件" -#: ../src/build.c:1926 +#: ../src/build.c:1917 msgid "Make Custom Target" msgstr "编译自定义目标" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "在这里输入自定义参数，所有输入的文本将作为 make 命令的参数。" -#: ../src/build.c:1976 +#: ../src/build.c:1967 msgid "Build the current file with Make and the default target" msgstr "使用 Make 和缺省目标来生成当前文件" -#: ../src/build.c:1979 +#: ../src/build.c:1970 msgid "Build the current file with Make and the specified target" msgstr "使用 Make 和特定目标来生成当前文件" -#: ../src/build.c:1982 +#: ../src/build.c:1973 msgid "Compile the current file with Make" msgstr "使用 Make 来编译文件" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "执行查看程序失败" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, c-format msgid "Process could not be stopped (%s)." msgstr "进程无法停止(%s)" -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "没有 生成 错误。" @@ -303,8 +303,8 @@ msgid "Do you really want to quit?" msgstr "您真的要退出吗？" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "重新载入(_R)" @@ -317,52 +317,52 @@ msgid "Are you sure you want to reload '%s'?" msgstr "您确定要重新载入 '%s' 吗？" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 msgid "Go to Line" msgstr "跳转行" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "输入您要跳转到的行号:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "在使用这个功能前请设置当前文件的文件类型。" -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "dd.mm.yyyy" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "mm.dd.yyyy" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "yyyy/mm/dd" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "dd.mm.yyyy hh:mm:ss" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "mm.dd.yyyy hh:mm:ss" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "yyyy/mm/dd hh:mm:ss" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 msgid "_Use Custom Date Format" msgstr "使用自定义日期格式(_U)" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 msgid "Custom Date Format" msgstr "自定义日期格式" -#: ../src/callbacks.c:1495 +#: ../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." @@ -370,51 +370,51 @@ "请在这里输入自定义日期和时间格式。你可以使用ANSI C strftime函数中的任何一个转" "义符。" -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "日期格式字符串无法转换(可能太长了)" -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "没有消息" #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "打开文件" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "查看(_V)" -#: ../src/dialogs.c:150 +#: ../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 "以只读模式打开文件。如果你打开多个文件，所有文件都会以只读模式打开。" -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "根据文件扩展名探测" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "根据文件探测" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 msgid "_More Options" msgstr "更多选项(_M)" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "显示隐藏文件(_H)" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "设置编码" -#: ../src/dialogs.c:287 +#: ../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 " @@ -426,11 +426,11 @@ "如果同时打开多个文件，则所有文件都被以该编码打开。" #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "设置文件类型:" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -440,151 +440,177 @@ "明确定义文件类型。当Geany无法准确探测到文件类型时应明确定义。\n" "如果同时打开多个文件，则所在文件都被以该类型打开。" -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +#, fuzzy +msgid "Overwrite?" +msgstr "覆写(_O)" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "保存文件" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 msgid "R_ename" msgstr "重命名(_E)" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "保存并重命名文件" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "在新标签打开文件(_O)" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "不关闭未保存的文件并在新标签中打开新保存的文件。" -#: ../src/dialogs.c:622 +#: ../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 "不保存(_D)" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "文件 %s 没有保存" -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "您要在关闭文件前保存吗？" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "选择字体" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "产生了一个错误或文件信息取不到(比如一个空文件)" -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "未知" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "属性" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "类型:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "大小:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "位置:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "只读:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "(仅在Geany中)" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "编码:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "(含有 BOM)" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "(没有 BOM)" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "修改于:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "变更于:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "访问于:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "权限:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "读:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "写:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "所有者:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "组:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "其他" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "文件 %s 已关闭。" -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "新文件 \"%s\" 已打开。" -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "无法打开文件 %s (%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -598,67 +624,70 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "文件 \"%s\" 是非法的 %s." -#: ../src/document.c:1030 +#: ../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 "文件 \"%s\" 可能不是文本文件或文件编码不支持。" -#: ../src/document.c:1168 +#: ../src/document.c:1122 msgid "Spaces" msgstr "空格" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "制表符" -#: ../src/document.c:1174 +#: ../src/document.c:1128 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:1179 +#: ../src/document.c:1133 #, c-format msgid "Setting %s indentation mode for %s." msgstr "设置 %s 缩进模式用于 %s 。" -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "非法文件名" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "文件 %s 已重新载入。" -#: ../src/document.c:1354 +#. 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 "文件 %s 已打开(%d%s)。" -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ", 只读" -#: ../src/document.c:1561 +#: ../src/document.c:1512 msgid "Error renaming file." msgstr "重命名文件出错。" -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." msgstr "文件 \"%s\".从UTF-8转换过来时出错。文件未保存。" -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" @@ -667,52 +696,52 @@ "出错信息： %s\n" "错误产生于 \"%s\" (行： %d, 列： %d)。" -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, c-format msgid "Error message: %s." msgstr "出错信息： %s 。" -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "保存文件出错。" -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "保存文件(%s)出错。" -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "文件 %s 已保存。" -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" 未找到。" -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "要从循环查找吗？" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../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 "未找到匹配项“'%s”。" -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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:替换了 %d 处，由\"%s\" 变为 \"%s\"。" msgstr[1] "%s:替换了 %d 处，由\"%s\" 变为 \"%s\"。" -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "您要重新载入吗？" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -721,32 +750,20 @@ "磁盘中的文件 '%s' \n" "比当前编辑的新。" -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "尝试重新保存文件？" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "文件 \"%s\" 未找到！" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "Win (CRLF)" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "Mac (CR)" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "Unix (LF)" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 msgid "Enter Tab Width" msgstr "输入制表符宽度" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "输入制表符占用多少空格的宽度。" @@ -847,133 +864,122 @@ msgstr "繁体中文" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "日语" -#: ../src/encodings.c:141 ../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 "朝鲜语" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "没有编码" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "西欧语系(_W)" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "东欧语系(_E)" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "东亚语系(_A)" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "东南亚和西南亚语系(_S)" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "中东语系(_M)" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "没有" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../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 "%s 源文件" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "%s 源文件" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "没有" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "Shell 源文件" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 msgid "XML document" msgstr "XML 文档" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "样式表" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "SQL 转储文件" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "不同文件" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "配置文件" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 msgid "Gettext translation file" msgstr "Gettext 翻译文件" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, c-format msgid "%s script file" msgstr "%s 脚本文件" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "重新结构化文件" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "编程语言(_P)" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "脚本语言(_S)" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "标记语言(_M)" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "其他语言(_I)" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "所有源文件" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "所有文件" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "文件类型 %s 的错误正则表达式: %s" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "未命名" @@ -987,8 +993,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "不可见" @@ -996,7 +1002,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 msgid "Open Selected F_ile" msgstr "打开选择的文件(_I)" @@ -1016,11 +1022,11 @@ msgid "Page Set_up" msgstr "页面设置(_U)" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 msgid "Close Ot_her Documents" msgstr "关闭其它文件(_H)" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 msgid "C_lose All" msgstr "全部关闭(_L)" @@ -1028,83 +1034,79 @@ msgid "_Edit" msgstr "编辑(_E)" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "全选(_A)" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "格式化(_F)" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 msgid "T_oggle Case of Selection" msgstr "切换大小写(_O)" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 msgid "_Comment Line(s)" msgstr "转换为注释(_C)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 msgid "U_ncomment Line(s)" msgstr "去除注释(_N)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 msgid "_Toggle Line Commentation" msgstr "切换注释状态(_T)" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 msgid "Du_plicate Line or Selection" msgstr "复制行或选中的文本" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "增加缩进(_I)" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "减少缩进(_D)" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 msgid "_Send Selection to Terminal" msgstr "发送选中的文字到终端(_S)" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 msgid "_Send Selection to" msgstr "发送选中的文字到(_S)" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "插入注释(_N)" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 msgid "Insert _ChangeLog Entry" msgstr "插入更改记录(_C)" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 msgid "Insert File _Header" msgstr "插入文件头(_H)" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 msgid "Insert _Function Description" msgstr "插入函数描述(_F)" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 msgid "Insert _Multiline Comment" msgstr "插入多行注释(_M)" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 msgid "Insert _GPL Notice" msgstr "插入GPL告知(_G)" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 msgid "Insert _BSD License Notice" msgstr "插入BSD许可公告(_B)" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "插入日期(_E)" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "插入 \"include <...>\"(I)" @@ -1128,7 +1130,7 @@ msgid "Find in F_iles" msgstr "在多个文件中查找(_I)" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "替换(_R)" @@ -1148,7 +1150,7 @@ msgid "Pr_evious Message" msgstr "下一个信息(_E)" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 msgid "_Go to Line" msgstr "跳转到指定行(_G)" @@ -1176,7 +1178,7 @@ msgid "Show Side_bar" msgstr "显示侧边栏(_B)" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "编辑器" @@ -1220,15 +1222,15 @@ msgid "In_dent Type" msgstr "缩进类型(_D)" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "制表符(_T)" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 msgid "_Spaces" msgstr "空格(_S)" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 msgid "T_abs and Spaces" msgstr "制表符和空格(_A)" @@ -1348,7 +1350,7 @@ msgid "_Debug Messages" msgstr "除错信息(_D)" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "标记" @@ -1372,128 +1374,134 @@ msgid "Scribble" msgstr "便签" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 msgid "Images _and Text" msgstr "图像和文字(_A)" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 msgid "_Images Only" msgstr "只有图像(_I)" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 msgid "_Text Only" msgstr "只有文字(_T)" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 msgid "_Large Icons" msgstr "大图标(_L)" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 msgid "_Small Icons" msgstr "小图标(_S)" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 msgid "_Very Small Icons" msgstr "小小图标(_V)" -#: ../src/interface.c:1770 -msgid "_Hide toolbar" +#: ../src/interface.c:1769 +#, fuzzy +msgid "_Customize Toolbar" msgstr "隐藏工具栏(_H)" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "隐藏工具栏(_H)" + +#: ../src/interface.c:2094 msgid "Find _Usage" msgstr "查找用法(_U)" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 msgid "Find _Document Usage" msgstr "查找文档用法(_D)" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 msgid "Go to _Tag Definition" msgstr "跳转到标记定义(_T)" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 msgid "Go to T_ag Declaration" msgstr "跳转到标记说明(_A)" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 msgid "Conte_xt Action" msgstr "背景运行(_X)" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "首选项" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "打开上次会话的文件" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "打开上次会话的文件" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 msgid "Load virtual terminal support" msgstr "启用虚拟终端支持" -#: ../src/interface.c:2690 +#: ../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 "是否有开始时载入虚拟终端，如果你不需要就禁用这个选项" -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "启用插件支持" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 msgid "Startup" msgstr "启动" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "保存窗口位置和尺寸" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "保存窗口位置和尺寸" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "退出时确认" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 msgid "Shows a confirmation dialog on exit" msgstr "退出时显示确认对话框" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 msgid "Shutdown" msgstr "关闭" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "根路径:" -#: ../src/interface.c:2758 +#: ../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 "" "打开或保存文件时要进入的路径，必须是一个绝对路径。留空表示使用当前工作路径。" -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 msgid "Project files:" msgstr "项目路径:" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "当打开项目时的路径" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "额外插件路径:" -#: ../src/interface.c:2808 +#: ../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 " @@ -1502,49 +1510,50 @@ "Geany 会在安装路径和定义路径中找寻插件。这里可以定义额外的插件路径。如果留空" "则取消这个功能。" -#: ../src/interface.c:2821 +#: ../src/interface.c:2841 msgid "Paths" msgstr "路径" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 msgid "Startup" msgstr "启动" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "当编译结束时响铃" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "当编译出错或结束时是否响铃" -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "有新的信息时切换到信息窗口" -#: ../src/interface.c:2856 +#: ../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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "禁止在状态栏中显示信息" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." msgstr "清空状态栏信息。保留状态信息窗口中的信息。" -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +#, fuzzy +msgid "Auto-focus widgets (focus follows mouse)" msgstr "自动焦点构件(焦点跟随鼠标)" -#: ../src/interface.c:2866 +#: ../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 " @@ -1553,54 +1562,54 @@ "鼠标下的构件自动获得焦点。起作用的构件有主编辑窗口、便签窗口、工具栏中查找定" "位框和VTE。" -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 msgid "Miscellaneous" msgstr "杂项" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "总是循环查找并隐藏查找对话框" -#: ../src/interface.c:2891 +#: ../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:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "使用查找时自动填入当前光标下单词" -#: ../src/interface.c:2896 +#: ../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:2898 +#: ../src/interface.c:2918 msgid "Use the current file's directory for Find in Files" msgstr "多文件查找时使用当前文档目录" -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 msgid "Search" msgstr "搜索" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 msgid "Use project-based session files" msgstr "使用基于项目的会话文件" -#: ../src/interface.c:2924 +#: ../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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "在项目根目录保存项目文件" -#: ../src/interface.c:2929 +#: ../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 " @@ -1610,179 +1619,184 @@ "选用这个选项后，创建一个新项目时，缺省地项目文件会保存在项目文件的根目录。当" "然你仍可以在新建项目对话框中改变项目文件的保存目录" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 msgid "Projects" msgstr "项目" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 msgid "Miscellaneous" msgstr "杂项" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "常规" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "显示标记列表" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "开关标记列表" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 msgid "Show documents list" msgstr "显示文件列表" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 msgid "Toggle the documents list on and off" msgstr "开关文件列表" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "边栏" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 msgid "Symbol list:" msgstr "标记列表:" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 msgid "Message window:" msgstr "信息窗口:" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 msgid "Editor:" msgstr "编辑器:" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "设置信息窗口字体" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 msgid "Sets the font for the symbol list" msgstr "设置标记列表字体" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 msgid "Sets the editor font" msgstr "设置编辑器字体" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "字体" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 msgid "Show editor tabs" msgstr "显示编辑器标签" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 msgid "Show close buttons" msgstr "显示关闭按钮" -#: ../src/interface.c:3064 +#: ../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 "在文件标签栏上显示一个叉号，以方便关闭标签（需要重启 Geany )。" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "把新文件标签放在:" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "左边" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "新文件标签会放在标签列表的左边" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "右边" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "新文件标签会放在标签列表的右边" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "双击隐藏所有附加构件" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "调用查看->开关所有附加构件命令" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 msgid "Editor tabs" msgstr "编辑器标签" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "顶端" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "底端" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 msgid "Sidebar:" msgstr "边栏:" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 msgid "Tab positions" msgstr "标签位置" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 msgid "Show status bar" msgstr "显示状态栏" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 msgid "Whether to show the status bar at the bottom of the main window" msgstr "是否在主窗口底部显示状态栏" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "界面" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 msgid "Show T_oolbar" msgstr "显示工具栏(_O)" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "向菜单添加工具栏(_A)" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "把工具栏放在菜单中以节省垂直空间" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 msgid "Toolbar" msgstr "工具栏" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 msgid "Icon style:" msgstr "图标样式:" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 msgid "Icon size:" msgstr "图标大小:" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "外观" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "显示工具栏(_T)" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "工具栏" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "自动换行" -#: ../src/interface.c:3349 +#: ../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 " @@ -1791,11 +1805,11 @@ "在窗口边缘自动换行。注意：因为在打开大文档时使用自动换行对性能影响很大，所以" "在比较慢的机器上应当关闭自动换行。" -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "启用“智能” home 键" -#: ../src/interface.c:3354 +#: ../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 " @@ -1807,29 +1821,29 @@ "时光标已经在第一个非空字符则会移动到行首。禁用这个功能则按按下 HOME 键光标会" "移到行首。" -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "禁用拖放" -#: ../src/interface.c:3359 +#: ../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 "在编辑窗口完全禁用拖放。" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "允许代码折叠" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "是否允许代码折叠" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "折叠或伸展一个折叠点的所有子孙" -#: ../src/interface.c:3369 +#: ../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." @@ -1837,317 +1851,330 @@ "折叠或伸展一个折叠点的所有子孙。当按下 Shift 键时点击折叠点符号时使用相反的选" "项。" -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "使用指示器显示编译错误" -#: ../src/interface.c:3374 +#: ../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 "使用指示器显示编译错误" -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "使用新的行去除行尾空白" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "使用新的行去除上一行的尾部空白。" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "换行列：" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 msgid "Comment toggle marker:" msgstr "注释开关记号：" -#: ../src/interface.c:3406 +#: ../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 "当开关源文件中一个行注释时添加的一个字符串。用于标记注释的开关。" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "功能" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 msgid "Features" msgstr "功能" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 msgid "Auto-indent mode:" msgstr "自动缩进模式:" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 msgid "Basic" msgstr "基本" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "当前字符" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 msgid "Match braces" msgstr "匹配花括号" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 msgid "Type:" msgstr "类型:" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 msgid "Width:" msgstr "宽度:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "一个缩进的宽度" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "缩进时使用空格" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "每个缩进使用一个制表符" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "当缩进小于制表符宽度时使用空格，否则两者都使用" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 msgid "Hard tab width:" msgstr "硬制表符宽度:" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "当打开文件时自动探测使用哪种缩进方式。" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 msgid "Tab key indents" msgstr "用 Tab 键缩进" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "使用 tab/shift-tab 来缩进或突出，而不是插入一个制表符。" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 msgid "Indentation" msgstr "缩进" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 msgid "Indentation" msgstr "缩进" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 msgid "Snippet completion" msgstr "片断自动完成" -#: ../src/interface.c:3581 +#: ../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:3583 -msgid "XML tag auto completion" +#: ../src/interface.c:3627 +#, fuzzy +msgid "XML tag autocompletion" msgstr "XML 标记自动完成" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "XML标记自动完成(包括HTML标记)" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "自动多行注释" -#: ../src/interface.c:3591 +#: ../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++ 和 Java 之类语言的源文件中，注释中插入新行时自动进行多行注释" -#: ../src/interface.c:3593 -msgid "Automatic symbol completion" -msgstr "符号自动完成" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "在打开的文件中用已知的符号自动自动补全(函数名、全局变量等等)" -#: ../src/interface.c:3604 +#: ../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 "最大符号名称建议：" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "自动完成列表高度：" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" msgstr "用于自动完成的字符串：" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 +#, fuzzy msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "显示符号自动完成列表的最小字符数量。" -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +#, fuzzy +msgid "Display height in rows for the autocompletion list" msgstr "自动完成列表的行数。" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +#, fuzzy +msgid "Maximum number of entries to display in the autocompletion list" msgstr "自动完成列表的最大条目数。" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 msgid "Completions" msgstr "自动完成" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "圆括号 ( )" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "自动配对圆括号" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "单引号 ' '" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "自动配对单引号" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "花括号 { }" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "自动配对花括号" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "中括号 [ ]" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "自动配对中括号" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "双引号 \" \"" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "自动配对双引号" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "自动配对引号和括号" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 msgid "Completions" msgstr "自动完成" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "反转语法高亮颜色" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "显示缩进标记" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "显示小点来标示缩进" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "显示空白" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "用点表示空格，箭头表示制表符" -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "显示行尾" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 msgid "Shows the line ending character" msgstr "显示行尾符号" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 msgid "Show line numbers" msgstr "显示行号" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "显示或隐藏行号页边空白" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "显示标记页边空白" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "显示或隐藏行号右边的可作标记的空白" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 msgid "Stop scrolling at last line" msgstr "在最后一行停止滚动" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "当移动到文档的最后一行时停止滚动。" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "显示" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "长行标志:" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "长行标志颜色:" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "设置长行标志颜色" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "颜色选择器" -#: ../src/interface.c:3826 +#: ../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 " @@ -2156,76 +2183,76 @@ "长行标志是编辑器中的一根细的竖线。它用于标志或提示比较长的行。请设置大于0的列" "数。" -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "线型" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "显示一根细的竖线" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "背景型" -#: ../src/interface.c:3846 +#: ../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 "以背景色来标示长行，当使用等宽字体时适用" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "关闭" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "长行标志" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 msgid "Display" msgstr "显示" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "从命令行打开新文档" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "当命令行中的文件名不存在时打开一个新文档。" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 msgid "Default end of line characters:" msgstr "缺省文件行尾符：" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "新建文件" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 msgid "Sets the default encoding for newly created files" msgstr "设置新建文件的缺省编码" -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 msgid "Default encoding (new files):" msgstr "缺省编码（新文件）:" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 msgid "Default encoding (existing files):" msgstr "缺省编码（已存在文件）:" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 msgid "Sets the default encoding for opening existing files" msgstr "设置打开已存在文件的缺省编码。" -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "使用固定的编码打开文件" -#: ../src/interface.c:3978 +#: ../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 " @@ -2233,99 +2260,99 @@ msgstr "" "这个选项禁止打开文件时进行编码检测并且用特定的编码打开文件(通常不需要)。" -#: ../src/interface.c:3980 +#: ../src/interface.c:4032 msgid "Encodings" msgstr "编码" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "保证文件尾有一个新的行" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 msgid "Ensures that at the end of the file is a new line" msgstr "保证文件尾有一个新的行" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 msgid "Strip trailing spaces and tabs" msgstr "去除行尾空白" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "去除行尾空格和制表符" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "用空格替换制表符" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 msgid "Replaces all tabs in document by spaces" msgstr "替换文档中所有制表符为空格" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "保存文件" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "最近文件的个数：" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "指定最近文件列表的文件个数" -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "磁盘检查间隔：" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "设置磁盘检查的间隔时间。零表示不检查。" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "文件" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 msgid "Make:" msgstr "生成:" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 msgid "Terminal:" msgstr "虚拟终端:" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 msgid "Browser:" msgstr "浏览器:" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "生成工具的路径和参数" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" msgstr "虚拟终端如xterm、gnome-terminal或konsole(应当接受 -e 参数)" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "浏览器的路径和参数" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 msgid "Tool paths" msgstr "工具路径" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 msgid "Context action:" msgstr "背景运行:" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2335,67 +2362,67 @@ "背景运行命令。当前选中的文字可以和%s一起使用。它可以在给出的命令的任何地方，" "并且在执行前会被替换。" -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 msgid "Commands" msgstr "命令" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "工具" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "开发者的电子邮件" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "开发者名字的开头字母" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "开始的版本号:" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "新建文件使用的版本号" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "公司名称" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 msgid "Developer:" msgstr "开发者:" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 msgid "Company:" msgstr "公司:" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 msgid "Mail address:" msgstr "电子邮件:" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "开头字母:" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "开发者的名字" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 msgid "Year:" msgstr "年:" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 msgid "Date:" msgstr "日期:" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "日期和时间:" -#: ../src/interface.c:4382 +#: ../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." @@ -2403,93 +2430,93 @@ "定义 {datetime}（日期时间）通配符的格式。可以使用 ANSI C strftime 函数的转义" "符。" -#: ../src/interface.c:4389 +#: ../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 "定义 {year}（年）通配符的格式。可以使用 ANSI C strftime 函数的转义符。" -#: ../src/interface.c:4396 +#: ../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 "" "定义 {date}（日期）通配符的格式。可以使用 ANSI C strftime 函数的转义符。" -#: ../src/interface.c:4398 +#: ../src/interface.c:4450 msgid "Template data" msgstr "模板数据" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "模板" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 msgid "C_hange" msgstr "改变(_H)" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 msgid "Keyboard shortcuts" msgstr "快捷键" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "快捷键" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 msgid "Command:" msgstr "命令：" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "打印文件命令路径（使用 %f 作为文件名）" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "使用外部命令打印" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 msgid "Print line numbers" msgstr "打印行号" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "在打印的页面上添加行号。" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 msgid "Print page numbers" msgstr "打印页数" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "在每页底部打印页号，占用每页的两行。" -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "打印页头" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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 "" "在每页打印页头。页头包括页号、文件名和当前日期（见下）。页头占用每页三行。" -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "使用打印文件的基本文件名" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" msgstr "只打印文件的基本文件名，不包括路径。" -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 msgid "Date format:" msgstr "自定义日期格式：" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 " @@ -2497,535 +2524,554 @@ msgstr "" "定义用于每页页头的日期和时间戳的格式。可以使用 ANSI C strftime 函数的转义符。" -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "使用本地 GTK 打印" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 msgid "Printing" msgstr "打印" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 msgid "Project Properties" msgstr "项目属性" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 msgid "File" msgstr "文件" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "新建" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "打开" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 msgid "Open selected file" msgstr "打开选择的文件" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "保存" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 msgid "Save as" msgstr "另存为" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "全部保存" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "打印" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "关闭" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "全部关闭" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "重新载入文件" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 msgid "Project" msgstr "项目" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 msgid "Project properties" msgstr "项目属性" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "撤消" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "重做" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "复制行或选中的文本" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 msgid "Delete current line(s)" msgstr "删除当前行" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "删除当前行" + +#: ../src/keybindings.c:244 msgid "Transpose current line" msgstr "调换当前行" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 msgid "Scroll to current line" msgstr "滚到当前行" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 msgid "Scroll up the view by one line" msgstr "逐行移动" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "逐行地向下滚动视图" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 msgid "Complete snippet" msgstr "完成片断" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "在片断中移动光标" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 msgid "Suppress snippet completion" msgstr "禁止完成片断" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 msgid "Context Action" msgstr "背景运行" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "自动完成" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "显示函数原型" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "显示宏列表" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "剪贴板" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "剪切" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 msgid "Copy" msgstr "复制" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "粘贴" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 msgid "Copy current line(s)" msgstr "复制当前行" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 msgid "Cut current line(s)" msgstr "剪切当前行" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 msgid "Select" msgstr "选择" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "全选" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 msgid "Select current word" msgstr "选择当前词" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 msgid "Select current line(s)" msgstr "选择当前行" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 msgid "Select current paragraph" msgstr "选择当前节" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 msgid "Format" msgstr "格式化" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 msgid "Toggle Case of Selection" msgstr "开关注释" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "开关行注释" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 msgid "Comment line(s)" msgstr "注释行" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 msgid "Uncomment line(s)" msgstr "非注释行" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "增大缩进" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "减小缩进" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 msgid "Increase indent by one space" msgstr "增大缩进" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 msgid "Decrease indent by one space" msgstr "减小缩进" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "智能缩进" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 msgid "Send to Custom Command 1" msgstr "发送自定义命令 1" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 msgid "Send to Custom Command 2" msgstr "发送自定义命令 2" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 msgid "Send to Custom Command 3" msgstr "发送自定义命令 3" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 msgid "Send Selection to Terminal" msgstr "发送选中的文字到终端" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 msgid "Insert" msgstr "插入" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "插入日期" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "入可选择的空白" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 msgid "Settings" msgstr "设置" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 msgid "Search" msgstr "搜索" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "查找" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "查找下一个" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "查找上一个" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 msgid "Find Next Selection" msgstr "查找下一个选择" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 msgid "Find Previous Selection" msgstr "查找上一个选择" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "替换" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 msgid "Find in Files" msgstr "在多个文件中查找" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 msgid "Next Message" msgstr "下一个信息" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 msgid "Previous Message" msgstr "前一个信息" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "查找用法" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 msgid "Find Document Usage" msgstr "查找文档用法" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "生成全部(_M)" + +#: ../src/keybindings.c:369 msgid "Go to" msgstr "跳转行" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "返回上一个位置" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "前进一个位置" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 msgid "Go to matching brace" msgstr "跳转到对应花括号" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 msgid "Toggle marker" msgstr "开关记号" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 msgid "Go to next marker" msgstr "到下一个记号" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "回到前一个记号" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "跳转到标记边界" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "跳转到标记说明" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 msgid "Go to Start of Line" msgstr "跳转到行首" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 msgid "Go to End of Line" msgstr "跳转行尾" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "跳转行尾" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "跳转到前一个词" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 msgid "Go to Next Word Part" msgstr "跳转到下一个词" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 msgid "View" msgstr "查看" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "开关所有附加构件" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "全屏" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "开关信息窗口" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "开关边栏" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "缩小" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "扩大" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 msgid "Focus" msgstr "焦点" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "切换到编辑器" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "切换到便签" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "切换到虚拟终端" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 msgid "Switch to Search Bar" msgstr "切换到查找栏" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 msgid "Switch to Sidebar" msgstr "切换到边栏" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 msgid "Switch to Compiler" msgstr "切换到编译器" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 msgid "Notebook tab" msgstr "分页窗口标签" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "切换到左文档" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "切换到右文档" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 msgid "Switch to last used document" msgstr "切换到上次使用的文楼" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 msgid "Move document left" msgstr "向左移动文档" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 msgid "Move document right" msgstr "向右移动文档" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 msgid "Move document first" msgstr "移动到第一个文档" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 msgid "Move document last" msgstr "移动到最后一个文档" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 msgid "Document" msgstr "文档" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 msgid "Toggle Line wrapping" msgstr "切换自动换行" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 msgid "Toggle Line breaking" msgstr "切换自动断行" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 msgid "Replace spaces by tabs" msgstr "替换空格为制表符" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 msgid "Toggle current fold" msgstr "开关当前折叠点" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "折叠全部" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "展开全部" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "重新载入符号列表" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "生成全部" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "编译" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "产生全部" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "自定义生成参数" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "生成目标" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "下一个错误" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 msgid "Previous error" msgstr "前一个错误" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "运行" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "运行(可选命令)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "生成参数" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 msgid "Show Color Chooser" msgstr "显示颜色选择器" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 msgid "Help" msgstr "帮助" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 msgid "Keyboard Shortcuts" msgstr "快捷键" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "下列快捷键可定义:" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 msgid "Switch to Document" msgstr "切换到文档" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "您请随便写，当便签或草稿好了。" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 msgid "Failed to load one or more session files." msgstr "打开一个或多个上次会话的文件失败。" -#: ../src/log.c:177 +#: ../src/log.c:181 msgid "Debug Messages" msgstr "除错信息" @@ -3080,7 +3126,7 @@ msgstr "打印 Geany 的安装前辍" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "不要载入上次会话文件" #: ../src/main.c:143 @@ -3095,24 +3141,24 @@ msgid "Show version and exit" msgstr "显示版本和退出" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "[文件...]" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "现在移动？" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "Geany 需要在开始前移动你的老设置路径。" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3121,14 +3167,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "你的设置路径无法 \"%s\" 变为 \"%s\" (%s). 请手动变更。" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3139,22 +3185,22 @@ "如果没有设置文件目录Geany可能会出问题。\n" "不管他，继续使用？" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, c-format msgid "Could not find file '%s'." msgstr "无法找到 '%s'文件。" -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "这是Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "设置文件目录无法创建 (%s)。" -#: ../src/main.c:1275 +#: ../src/main.c:1224 msgid "Configuration files reloaded." msgstr "设置文件已重新载入。" @@ -3170,18 +3216,18 @@ msgid "_Hide Message Window" msgstr "隐藏信息窗口(_H)" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "插件 \"%s\" 与这个版本的 Geany 不匹配，请重新编译该插件。" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "插件管理器(_P)" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3192,76 +3238,84 @@ "说明： %s\n" "作者： %s" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 msgid "Active" msgstr "激活" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "插件" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "没有可用插件。" -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "插件" -#: ../src/plugins.c:1263 +#: ../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:1276 +#: ../src/plugins.c:1263 msgid "Plugin details:" msgstr "插件细节：" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "操作" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "快捷键" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "获取按键" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "请按下用于\"%s\"的按键组合。" -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +msgid "_Expand All" +msgstr "全部展开(_E)" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +msgid "_Collapse All" +msgstr "全部折叠(_C)" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "操作" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "快捷键" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "覆写(_O)" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "覆写快捷键？" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "按键组合 '%s' 已用于 \"%s\" 。" #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "在下面输入工具路径。不需要的请留空。" #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "定义用于模板的信息。如果不清楚模板如何工作请帮助文档。" -#: ../src/prefs.c:1458 +#: ../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." @@ -3271,7 +3325,7 @@ "生效。 " #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3281,7 +3335,7 @@ "击一个操作直接编辑快捷键的字符串，您就可以设置操作的快捷键。" #. page Printing -#: ../src/prefs.c:1469 +#: ../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)." @@ -3289,59 +3343,59 @@ "注意：只有 Geany 使用 GTK 2.10 ( 或以上版本 ) 编译并且 Geany 运行" "于 GTK 2.10 ( 或以上版本 ) 时本地 GTK 打印才可用。" -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" -"注意：要自定义工具栏，请编辑 'ui_toolbar.xml 文件'. 详见相关文档。" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "警告：这些设置被当前项目重载。见 项目->属性。" -#: ../src/printing.c:270 +#: ../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 "第 %d 页，共 %d 页" -#: ../src/printing.c:340 +#: ../src/printing.c:375 msgid "Document Setup" msgstr "文档设置" -#: ../src/printing.c:375 +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" msgstr "打印文件的基本文件名，不包括路径。" -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, c-format msgid "Page %d of %d" msgstr "第 %d 页，共 %d 页" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, c-format msgid "Printing of file %s was cancelled." msgstr "打印 \"%s\" 取消。" -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, c-format msgid "File %s printed." msgstr "文件 %s 打印完毕。" -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, c-format msgid "Printing of %s failed (%s)." msgstr "打印 %s 失败 (%s)。" -#: ../src/printing.c:832 +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." msgstr "请先在首选项对话框中设置打印命令。" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3352,7 +3406,7 @@ "\n" "%s" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "打印 \"%s\" 失败 (返回代码: %s)。" @@ -3371,19 +3425,19 @@ msgid "C_reate" msgstr "创建(_R)" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "名称:" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 msgid "Filename:" msgstr "文件名:" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "根路径:" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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 " @@ -3392,528 +3446,538 @@ "组成项目的所有文件的根路径，可以是一个新路径或一个已存在的路径。你可以使用与" "项目名关联的路径。" -#: ../src/project.c:174 ../src/project.c:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "选择项目根目录" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "项目文件 \"%s\" 无法载入。" -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 msgid "Open Project" msgstr "打开项目" -#: ../src/project.c:292 +#: ../src/project.c:296 msgid "Project files" msgstr "项目文件" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "项目 %s 已关闭。" -#: ../src/project.c:408 +#: ../src/project.c:412 msgid "Description:" msgstr "描述:" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "在根路径中编译" -#: ../src/project.c:448 +#: ../src/project.c:452 msgid "Run command:" msgstr "运行命令:" -#: ../src/project.c:457 +#: ../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:472 +#: ../src/project.c:476 msgid "File patterns:" msgstr "文件模式:" -#: ../src/project.c:574 +#: ../src/project.c:578 msgid "Do you want to close it before proceeding?" msgstr "您要在执行前关闭文件吗？" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "'%s' 项目已经打开。" -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "定义的项目名称太短。" -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "定义的项目名称太短。(最大%d个字符)。" -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "项目文件名非法。" -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "创建项目根目录？" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "路径 \"%s\" 不存在。" -#: ../src/project.c:666 +#: ../src/project.c:670 #, c-format msgid "Project base directory could not be created (%s)." msgstr "项目文件根目录无法创建 (%s)。" -#: ../src/project.c:678 +#: ../src/project.c:682 #, c-format msgid "Project file could not be written (%s)." msgstr "项目文件无法写入 (%s)。" -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "项目\"%s\"已创建。" -#: ../src/project.c:728 +#: ../src/project.c:732 #, c-format msgid "Project \"%s\" saved." msgstr "项目 \"%s\" 已保存。" #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 msgid "Choose Project Filename" msgstr "选择项目文件名" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "选择项目运行命令" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "项目\"%s\"已打开。" -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "使用正则表达式(_U)" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "使用POSIX-like正则表达式，详见帮助文档。" -#: ../src/search.c:212 +#: ../src/search.c:227 msgid "Search _backwards" msgstr "向后搜索(_B)" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "使用转义序列(_E)" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" msgstr "替换\\\\, \\t, \\n, \\r and \\uXXXX (Unicode字符串)为对应的控制字符。" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 msgid "C_ase sensitive" msgstr "大小写敏感(_A)" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "整词配对(_W)" -#: ../src/search.c:250 +#: ../src/search.c:265 msgid "Match from s_tart of word" msgstr "匹配词首(_T)" -#: ../src/search.c:371 +#: ../src/search.c:386 msgid "_Previous" msgstr "查找上一个(_P)" -#: ../src/search.c:377 +#: ../src/search.c:392 msgid "_Next" msgstr "查找下一个(_N)" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 msgid "_Search for:" msgstr "搜索(_S):" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 msgid "_Find All" msgstr "全部查找(_F)" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "标记(_M)" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "在当前文档中标记所有匹配项。" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "在所有打开的文档中(_O)" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 msgid "_In Document" msgstr "在当前文档中(_I)" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "关闭对话框(_D)" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "禁止该选项使对话框保持打开" -#: ../src/search.c:514 +#: ../src/search.c:529 msgid "Replace & Fi_nd" msgstr "替换和查找(_N)" -#: ../src/search.c:523 +#: ../src/search.c:538 msgid "Replace wit_h:" msgstr "替换为(_H)：" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 msgid "Re_place All" msgstr "全部替换(_P)" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "在选中的文字中(_L)" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "在当前选中的文字中替换" -#: ../src/search.c:681 +#: ../src/search.c:696 msgid "_Directory:" msgstr "目录(_D):" -#: ../src/search.c:712 +#: ../src/search.c:727 msgid "E_ncoding:" msgstr "编码(_N):" -#: ../src/search.c:737 +#: ../src/search.c:752 msgid "Fixed s_trings" msgstr "完全匹配(_T)" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "_Grep正则表达式" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "详情请参阅 grep 手册" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "扩展正则表达式" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "搜索子目录(_R)" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "反转查找结果(_I)" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "反转查找结果以选择不匹配的行" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "额外的参数:" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "传给Grep的其它参数" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../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] "找到 %d 个 \"%s\" 的匹配项。" msgstr[1] "找到 %d 个 \"%s\" 的匹配项。" -#: ../src/search.c:1184 +#: ../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 个文件中替换了文本。" -#: ../src/search.c:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "非法目录" -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "未找到" -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "无法执行grep工具 '%s'，请检查首选项中的设置。" -#: ../src/search.c:1400 +#: ../src/search.c:1419 msgid "Searching..." msgstr "搜索..." -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (在目录 %s中)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "无法打开目录(%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "搜索失败（详见 帮助->除错信息）" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "搜索完成，找到 %d 个匹配项。" msgstr[1] "搜索完成，找到 %d 个匹配项。" -#: ../src/search.c:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "未找到匹配项。" -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "章" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "节" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "节1" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "节2" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "节3" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "索引" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "模块" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../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:595 +#: ../src/symbols.c:611 msgid "Type constructors" msgstr "类型结构" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 msgid "Sections" msgstr "节" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "命令" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "环境" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "小节" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "小小节" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "标签" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 msgid "Structures" msgstr "结构" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "包" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "我的" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "本地的" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "我们的" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "固定值" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "锚点" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "标题 (H1)" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "标题 (H2)" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "标题 (H3)" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 msgid "ID Selectors" msgstr "ID 选择" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 msgid "Type Selectors" msgstr "类型选择" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 msgid "Modules" msgstr "模块" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "单态" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "命名空间" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "属性" + +#: ../src/symbols.c:736 +#, fuzzy +msgid "Imports" +msgstr "导出" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "成员" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 msgid "Labels" msgstr "标签" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "子程序" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "块" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "宏" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 msgid "Defines" msgstr "预定义" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "目标" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "命名空间" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 msgid "Structs" msgstr "结构" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "定义 / 枚举" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "\"%s\"是未知的文件类型。\n" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "创建标记文件失败，可能因为没找到标记。\n" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" @@ -3922,7 +3986,7 @@ "用法: %s -g <标记文件> <文件列表>\n" "\n" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -3933,167 +3997,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:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "载入标记" -#: ../src/symbols.c:1357 +#: ../src/symbols.c:1387 msgid "Geany tag files (*.tags)" msgstr "Geany 标记文件 (*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1377 +#: ../src/symbols.c:1407 #, c-format msgid "Loaded %s tags file '%s'." msgstr "载入 %s 标记文件 '%s'。" -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, c-format msgid "Could not load tags file '%s'." msgstr "无法载入标记文件 '%s'。" -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr " \"%s()\" 的声明未找到。" -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr " \"%s()\" 的定义未找到。" -#: ../src/symbols.c:1806 -msgid "_Expand All" -msgstr "全部展开(_E)" - -#: ../src/symbols.c:1811 -msgid "_Collapse All" -msgstr "全部折叠(_C)" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 msgid "Sort by _Name" msgstr "按名称排序(_N)" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 msgid "Sort by _Appearance" msgstr "按外观排序(_A)" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "保存文件" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -msgid "Save All" -msgstr "全部保存" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "保存全部打开的文件" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "重新载入文件" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "关闭文件" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 msgid "Close all open files" msgstr "关闭所有打开的文件" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 msgid "Cut the current selection" msgstr "剪切选中的文字" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 msgid "Copy the current selection" msgstr "复制选中的文字" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "把内容粘贴到剪帖板" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 msgid "Delete the current selection" msgstr "删除选中的文字" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "撤消上次操作" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "重做上次操作" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "编译文件" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "运行或查看文件" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "打开颜色选择器对话框，从调色盘中选择颜色" -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "缩小文字" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "放大文字" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 msgid "Decrease indentation" msgstr "减小缩进" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 msgid "Increase indentation" msgstr "增大缩进" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "输入要查找的文字" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 msgid "Jump to the entered line number" msgstr "跳转到指定行" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "显示属性对话框" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "退出" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 msgid "Print document" msgstr "打印文档" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "这个文件中的改动在重启 Geany 后生效。" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "在当前文档中标记所有匹配项。" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "新建文件" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "打开文件" -#: ../src/toolbar.c:208 +#: ../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 "显示" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4157,123 +4232,144 @@ msgid "Characters:" msgstr "字数:" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "未找到标记" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 msgid "Show S_ymbol List" msgstr "显示符号列表(_Y)" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 msgid "Show _Document List" msgstr "显示打开的文件的列表(_D)" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 msgid "H_ide Sidebar" msgstr "隐藏边栏(_I)" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "显示全路径名(_F)" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../src/ui_utils.c:188 #, c-format msgid "line: %d\t col: %d\t sel: %d\t " msgstr "行： %d\t 列： %d\t 选择： %d\t " #. RO = read-only -#: ../src/ui_utils.c:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "只读 " #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "覆盖" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "插入" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "制表符" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "空格" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "制表符或空格" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "模式： %s" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, c-format msgid "encoding: %s %s" msgstr "编码： %s %s" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "文件类型： %s" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "已修改" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "范围： %s" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "字体已更新(%s)。" -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C标准库" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "ISO C99" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++ (C 标准库)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "C++ 标准库" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "C++ STL" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 msgid "_Set Custom Date Format" msgstr "设置自定义日期格式(_S)" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select Folder" msgstr "选择目录" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 msgid "Select File" msgstr "选择文件" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 msgid "C_onfiguration Files" msgstr "设置文件(_O)" -#: ../src/ui_utils.c:1756 +#: ../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 "虚拟终端" @@ -4427,161 +4523,145 @@ msgstr "" "在虚拟终端中而不是在一个终端中执行程序。注意：虚拟终端中的程序不能停止。" -#: ../src/win32.c:131 +#: ../src/win32.c:135 msgid "Geany project files" msgstr "Geany 项目文件" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "可执行" -#: ../src/win32.c:575 -msgid "Error" -msgstr "错误" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "问题" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "警告" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "信息" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Class Builder" msgstr "类创建器" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "为新的类种类创建源代码" -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "创建类" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 msgid "Class" msgstr "类" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 msgid "Class name:" msgstr "类名称:" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 msgid "Header file:" msgstr "头文件:" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 msgid "Source file:" msgstr "源文件:" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 msgid "Inheritance" msgstr "继承" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "基础类:" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "基础头文件:" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "全局变量" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 msgid "Base GType:" msgstr "基础 GType:" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 msgid "Options" msgstr "参数" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 msgid "Create constructor" msgstr "创建构造器" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 msgid "Create destructor" msgstr "创建析出器" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "GTK+ 构造类型" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "创建类(_S)" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 msgid "_C++ Class" msgstr "_C++ 类" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 msgid "_GTK+ Class" msgstr "_GTK+ 类" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "HTML Characters" msgstr "HTML字符" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "插入 HTML 实体字符如 like '&'。" -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../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 "Geany 开发团队" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "HTML字符" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "ISO 8859-1字符" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "希腊字符" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "数学字符" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "技术字符" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "箭头字符" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "标点符号" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "其他字符" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 msgid "Special Characters" msgstr "特殊字符" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 msgid "_Insert" msgstr "插入(_I)" -#: ../plugins/htmlchars.c:467 +#: ../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." @@ -4589,155 +4669,155 @@ "从下面的列表中选择一个特殊字符后点击插入按钮或双击特殊字符就可以在当前光标位" "置插入该特殊字符。" -#: ../plugins/htmlchars.c:481 +#: ../plugins/htmlchars.c:472 msgid "Character" msgstr "字符" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "HTML表示" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "插入特殊HTML字符(_I)" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 msgid "HTML Replacement" msgstr "HTML替换" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "HTML开关(_H)" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "大量替换特殊字符" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "插入特殊HTML字符" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 msgid "Replace special characters" msgstr "替换特殊字符" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 msgid "Toggle plugin status" msgstr "开关插件状态" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "导出" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Exports the current file into different formats." msgstr "导出当前文件为不同格式。" -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 msgid "Export File" msgstr "导出文件" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "使用当前缩放级别(_U)" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "把当前缩放级别应用到所有文档上" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "文档成功导出为 '%s'。" -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, c-format msgid "File '%s' could not be written (%s)." msgstr "文件“'%s”无法写成为(%s)。" -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "文件 '%s' 已存在。您要覆盖吗？" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "导出(_E)" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "为 _HTML" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "为 _LaTeX" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "File Browser" msgstr "文件浏览器" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "在边栏上增加浏览器标签" -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "选择了太多项！" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "无法执行定义的外部命令 '%s' (%s) 。" -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "外部打开(_E)" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 msgid "_Find in Files" msgstr "在多个文件中查找(_F)" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 msgid "Show _Hidden Files" msgstr "显示隐藏文件(_H)" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "上" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "刷新" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "家" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 msgid "Set path from document" msgstr "根据文档设置路径" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 msgid "Clear the filter" msgstr "清空过滤器" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 msgid "Filter:" msgstr "过滤器：" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "聚焦文件列表" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "聚焦路径输入框" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 msgid "Plugin configuration directory could not be created." msgstr "插件定义目录无法创建。" @@ -4775,7 +4855,8 @@ "lib" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" +#, fuzzy +msgid "Use the project's base directory" msgstr "设置项目根路径" #: ../plugins/filebrowser.c:1132 @@ -4783,31 +4864,31 @@ "Change the directory to the base directory of the currently opened project" msgstr "改变当前打开项目的根路径" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "Save Actions" msgstr "保存动作" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "这个插件提供与保存文件相关的不同动作。" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "备份复制：目录无法创建 (%s)。" #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "备份复制：无法读取文件 (%s)。" -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "备份复制：无法保存文件 (%s)。" -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -4815,103 +4896,131 @@ msgstr[1] "自动保存：保存了 %d 个文件。" #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 msgid "Select Directory" msgstr "选择目录" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "备份目录不存在或不可写。" -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 msgid "Auto Save" msgstr "自动保存" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "启用(_E)" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "自动保存间隔(_I)：" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 msgid "seconds" msgstr "秒" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "文件自动保存后输出信息(_P)" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 msgid "Save only current open _file" msgstr "仅保存当前打开文件(_F)" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 msgid "Sa_ve all open files" msgstr "保存全部打开的文件(_V)" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 msgid "Instant Save" msgstr "立即保存" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "新打开文件使用的文件类型(_F)：" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "备份复制" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "备份复制的目录(_D)：" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "备份文件的日期时间格式（详见 \"man strftime\" ）(_T)：" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "备份目录的目录层次(_L)：" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "分割窗口" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "把编辑视图分割为两个窗口。" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "在当前文档中标记所有匹配项。" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "合并(_U)" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "分割窗口(_S)" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "水平分割(_H)" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "垂直分割(_V)" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "水平分割" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "垂直分割" -#: ../plugins/splitwindow.c:426 +#: ../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 失败(请确保其已编译)" @@ -5166,9 +5275,6 @@ #~ msgid "Structs / Typedefs" #~ msgstr "结构" -#~ msgid "Show _Full Path Name" -#~ msgstr "显示全路径名(_F)" - #~ msgid "Terminal emulation:" #~ msgstr "虚拟终端:" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/po/zh_TW.po /tmp/ssBwSf4GIv/geany-0.18/po/zh_TW.po --- geany-0.17/po/zh_TW.po 2009-04-23 21:47:38.000000000 +0100 +++ geany-0.18/po/zh_TW.po 2009-08-16 17:18:28.000000000 +0100 @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.16\n" +"Project-Id-Version: geany 0.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-23 22:36+0200\n" +"POT-Creation-Date: 2009-08-16 18:09+0200\n" "PO-Revision-Date: 2006-11-16 22:02+0800\n" "Last-Translator: KoViCH \n" "Language-Team: Chinese \n" @@ -31,285 +31,285 @@ msgid "Integrated Development Environment" msgstr "" -#: ../src/about.c:137 +#: ../src/about.c:139 msgid "About Geany" msgstr "關於Geany" -#: ../src/about.c:187 +#: ../src/about.c:189 msgid "A fast and lightweight IDE" msgstr "一個快速且輕巧的整合開發環境" -#: ../src/about.c:208 +#: ../src/about.c:210 #, fuzzy, c-format msgid "(built on or after %s)" msgstr "(在%s建立)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:239 +#: ../src/about.c:241 msgid "Info" msgstr "資訊" -#: ../src/about.c:255 +#: ../src/about.c:257 msgid "Developers" msgstr "開發者" -#: ../src/about.c:264 +#: ../src/about.c:266 #, fuzzy msgid "maintainer" msgstr "維護者" -#: ../src/about.c:272 +#: ../src/about.c:274 msgid "developer" msgstr "開發者" -#: ../src/about.c:280 +#: ../src/about.c:282 msgid "translation maintainer" msgstr "翻譯維護者" -#: ../src/about.c:289 +#: ../src/about.c:291 msgid "Translators" msgstr "翻譯者" -#: ../src/about.c:309 +#: ../src/about.c:311 #, fuzzy msgid "Previous Translators" msgstr "翻譯者" -#: ../src/about.c:330 +#: ../src/about.c:332 #, fuzzy msgid "Contributors" msgstr "自動補完文字" -#: ../src/about.c:340 +#: ../src/about.c:342 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -#: ../src/about.c:366 +#: ../src/about.c:368 msgid "Credits" msgstr "鳴謝" -#: ../src/about.c:380 +#: ../src/about.c:382 msgid "License" msgstr "授權條款" -#: ../src/about.c:389 +#: ../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 "" -#: ../src/build.c:219 ../src/build.c:769 +#: ../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 "" -#: ../src/build.c:234 ../src/build.c:674 +#: ../src/build.c:236 ../src/build.c:650 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "" -#: ../src/build.c:270 ../src/build.c:552 ../src/build.c:802 -#: ../src/search.c:1392 +#: ../src/build.c:272 ../src/build.c:528 ../src/build.c:778 +#: ../src/search.c:1411 #, c-format msgid "Process failed (%s)" msgstr "行程(%s)失敗" -#: ../src/build.c:532 +#: ../src/build.c:508 #, c-format msgid "%s (in directory: %s)" msgstr "%s(在目錄: %s)" -#: ../src/build.c:637 +#: ../src/build.c:613 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "" -#: ../src/build.c:731 +#: ../src/build.c:707 msgid "" "Could not execute the file in the VTE because it probably contains a command." msgstr "" -#: ../src/build.c:934 +#: ../src/build.c:914 msgid "Compilation failed." msgstr "編譯失敗." -#: ../src/build.c:948 +#: ../src/build.c:928 msgid "Compilation finished successfully." msgstr "編譯成功結束." #. compile the code -#: ../src/build.c:1052 +#: ../src/build.c:1039 msgid "_Compile" msgstr "編譯(_C)" #. build the code -#: ../src/build.c:1060 ../src/build.c:2130 ../src/interface.c:976 +#: ../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:1072 ../src/build.c:1178 ../src/build.c:2141 +#: ../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:1081 ../src/build.c:1187 ../src/build.c:2149 +#: ../src/build.c:1068 ../src/build.c:1174 ../src/build.c:2139 #, fuzzy msgid "Make Custom _Target" msgstr "建立自定義目標(_t)" #. build the code with make object -#: ../src/build.c:1090 ../src/build.c:2157 +#: ../src/build.c:1077 ../src/build.c:2147 #, fuzzy msgid "Make _Object" msgstr "建立物件(_o)" #. next error -#: ../src/build.c:1103 ../src/build.c:1200 +#: ../src/build.c:1090 ../src/build.c:1187 #, fuzzy msgid "_Next Error" msgstr "錯誤" -#: ../src/build.c:1110 ../src/build.c:1207 +#: ../src/build.c:1097 ../src/build.c:1194 #, fuzzy msgid "_Previous Error" msgstr "找上一個(_P)" #. arguments -#: ../src/build.c:1135 ../src/build.c:2169 +#: ../src/build.c:1122 ../src/build.c:2159 msgid "_Set Includes and Arguments" msgstr "" #. DVI -#: ../src/build.c:1156 +#: ../src/build.c:1143 msgid "LaTeX -> _DVI" msgstr "" #. PDF -#: ../src/build.c:1165 +#: ../src/build.c:1152 msgid "LaTeX -> _PDF" msgstr "" #. DVI view -#: ../src/build.c:1219 +#: ../src/build.c:1206 #, fuzzy msgid "_View DVI File" msgstr "檢視DVI檔案" #. PDF view -#: ../src/build.c:1229 +#: ../src/build.c:1216 #, fuzzy msgid "V_iew PDF File" msgstr "檢視PDF檔案" #. arguments -#: ../src/build.c:1244 +#: ../src/build.c:1231 #, fuzzy msgid "_Set Arguments" msgstr "設定參數" -#: ../src/build.c:1319 +#: ../src/build.c:1306 msgid "Set Arguments" msgstr "設定參數" -#: ../src/build.c:1326 +#: ../src/build.c:1313 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" -#: ../src/build.c:1337 +#: ../src/build.c:1324 msgid "DVI creation:" msgstr "" -#: ../src/build.c:1357 +#: ../src/build.c:1344 msgid "PDF creation:" msgstr "" -#: ../src/build.c:1377 +#: ../src/build.c:1364 msgid "DVI preview:" msgstr "" -#: ../src/build.c:1397 +#: ../src/build.c:1384 msgid "PDF preview:" msgstr "" -#: ../src/build.c:1414 ../src/build.c:1596 +#: ../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:1499 +#: ../src/build.c:1486 msgid "Set Includes and Arguments" msgstr "" -#: ../src/build.c:1506 +#: ../src/build.c:1493 msgid "Set the commands for building and running programs." msgstr "" #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1514 +#: ../src/build.c:1501 #, fuzzy, c-format msgid "%s commands" msgstr "指令" -#: ../src/build.c:1529 +#: ../src/build.c:1516 msgid "Compile:" msgstr "編譯:" -#: ../src/build.c:1551 +#: ../src/build.c:1538 msgid "Build:" msgstr "建構:" -#: ../src/build.c:1573 ../src/dialogs.c:1189 +#: ../src/build.c:1560 ../src/dialogs.c:1223 msgid "Execute:" msgstr "執行:" -#: ../src/build.c:1901 ../src/toolbar.c:194 +#: ../src/build.c:1892 ../src/toolbar.c:344 #, fuzzy msgid "Build the current file" msgstr "編譯目前檔案" -#: ../src/build.c:1926 +#: ../src/build.c:1917 #, fuzzy msgid "Make Custom Target" msgstr "建立自定義目標(_t)" -#: ../src/build.c:1927 +#: ../src/build.c:1918 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" -#: ../src/build.c:1976 +#: ../src/build.c:1967 #, fuzzy msgid "Build the current file with Make and the default target" msgstr "以建立工具和預設目標建構目前檔案" -#: ../src/build.c:1979 +#: ../src/build.c:1970 #, fuzzy msgid "Build the current file with Make and the specified target" msgstr "以建立工具和指定目標建構目前檔案" -#: ../src/build.c:1982 +#: ../src/build.c:1973 #, fuzzy msgid "Compile the current file with Make" msgstr "編譯目前檔案" -#: ../src/build.c:2044 +#: ../src/build.c:2035 msgid "Failed to execute the view program" msgstr "無法執行檢視程式" -#: ../src/build.c:2082 +#: ../src/build.c:2073 #, fuzzy, c-format msgid "Process could not be stopped (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../src/build.c:2101 ../src/build.c:2115 +#: ../src/build.c:2092 ../src/build.c:2106 msgid "No more build errors." msgstr "" @@ -317,8 +317,8 @@ msgid "Do you really want to quit?" msgstr "您真的想要離開嗎?" -#: ../src/callbacks.c:469 ../src/document.c:2898 ../src/interface.c:340 -#: ../src/treeviews.c:553 +#: ../src/callbacks.c:469 ../src/document.c:2867 ../src/interface.c:340 +#: ../src/treeviews.c:578 msgid "_Reload" msgstr "重新載入(_R)" @@ -331,106 +331,106 @@ msgid "Are you sure you want to reload '%s'?" msgstr "" -#: ../src/callbacks.c:1246 ../src/keybindings.c:367 +#: ../src/callbacks.c:1249 ../src/keybindings.c:376 #, fuzzy msgid "Go to Line" msgstr "前往行數" -#: ../src/callbacks.c:1246 +#: ../src/callbacks.c:1249 msgid "Enter the line you want to go to:" msgstr "請輸入您想移至的行:" -#: ../src/callbacks.c:1341 ../src/callbacks.c:1366 +#: ../src/callbacks.c:1344 ../src/callbacks.c:1369 msgid "" "Please set the filetype for the current file before using this function." msgstr "" -#: ../src/callbacks.c:1471 ../src/ui_utils.c:548 +#: ../src/callbacks.c:1474 ../src/ui_utils.c:542 msgid "dd.mm.yyyy" msgstr "" -#: ../src/callbacks.c:1473 ../src/ui_utils.c:549 +#: ../src/callbacks.c:1476 ../src/ui_utils.c:543 msgid "mm.dd.yyyy" msgstr "" -#: ../src/callbacks.c:1475 ../src/ui_utils.c:550 +#: ../src/callbacks.c:1478 ../src/ui_utils.c:544 msgid "yyyy/mm/dd" msgstr "" -#: ../src/callbacks.c:1477 ../src/ui_utils.c:559 +#: ../src/callbacks.c:1480 ../src/ui_utils.c:553 msgid "dd.mm.yyyy hh:mm:ss" msgstr "" -#: ../src/callbacks.c:1479 ../src/ui_utils.c:560 +#: ../src/callbacks.c:1482 ../src/ui_utils.c:554 msgid "mm.dd.yyyy hh:mm:ss" msgstr "" -#: ../src/callbacks.c:1481 ../src/ui_utils.c:561 +#: ../src/callbacks.c:1484 ../src/ui_utils.c:555 msgid "yyyy/mm/dd hh:mm:ss" msgstr "" -#: ../src/callbacks.c:1483 ../src/ui_utils.c:570 +#: ../src/callbacks.c:1486 ../src/ui_utils.c:564 #, fuzzy msgid "_Use Custom Date Format" msgstr "使用自定的日期格式" -#: ../src/callbacks.c:1494 +#: ../src/callbacks.c:1497 #, fuzzy msgid "Custom Date Format" msgstr "自定日期格式" -#: ../src/callbacks.c:1495 +#: ../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 "" -#: ../src/callbacks.c:1513 +#: ../src/callbacks.c:1516 msgid "Date format string could not be converted (possibly too long)." msgstr "" -#: ../src/callbacks.c:1770 ../src/callbacks.c:1780 +#: ../src/callbacks.c:1738 ../src/callbacks.c:1748 msgid "No more message items." msgstr "" #. initialize the dialog -#: ../src/dialogs.c:143 ../src/prefs.c:1581 +#: ../src/dialogs.c:140 ../src/prefs.c:1640 msgid "Open File" msgstr "開啟檔案" -#: ../src/dialogs.c:147 ../src/interface.c:691 +#: ../src/dialogs.c:144 ../src/interface.c:691 msgid "_View" msgstr "檢視(_V)" -#: ../src/dialogs.c:150 +#: ../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 "" -#: ../src/dialogs.c:172 +#: ../src/dialogs.c:169 msgid "Detect by file extension" msgstr "以附加檔名偵測" -#: ../src/dialogs.c:197 ../src/interface.c:3538 ../src/interface.c:5086 +#: ../src/dialogs.c:196 ../src/interface.c:3582 ../src/interface.c:5150 msgid "Detect from file" msgstr "從檔案偵測" -#: ../src/dialogs.c:259 +#: ../src/dialogs.c:258 #, fuzzy msgid "_More Options" msgstr "函式" #. line 1 with checkbox and encoding combo -#: ../src/dialogs.c:266 +#: ../src/dialogs.c:265 msgid "Show _hidden files" msgstr "顯示隱藏檔案" -#: ../src/dialogs.c:277 +#: ../src/dialogs.c:276 msgid "Set encoding:" msgstr "設定字元編碼:" -#: ../src/dialogs.c:287 +#: ../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 " @@ -440,11 +440,11 @@ msgstr "" #. line 2 with filetype combo -#: ../src/dialogs.c:294 +#: ../src/dialogs.c:293 msgid "Set filetype:" msgstr "" -#: ../src/dialogs.c:304 +#: ../src/dialogs.c:303 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -452,152 +452,177 @@ "filetype." msgstr "" -#: ../src/dialogs.c:411 +#: ../src/dialogs.c:389 +msgid "Overwrite?" +msgstr "" + +#: ../src/dialogs.c:390 +msgid "Filename already exists!" +msgstr "" + +#: ../src/dialogs.c:424 msgid "Save File" msgstr "儲存檔案" -#: ../src/dialogs.c:419 +#: ../src/dialogs.c:432 #, fuzzy msgid "R_ename" msgstr "越南文" -#: ../src/dialogs.c:421 +#: ../src/dialogs.c:434 msgid "Save the file and rename it" msgstr "" -#: ../src/dialogs.c:429 +#: ../src/dialogs.c:442 msgid "_Open file in a new tab" msgstr "" -#: ../src/dialogs.c:431 +#: ../src/dialogs.c:444 msgid "" "Keep the current unsaved document open and open the newly saved file in a " "new tab" msgstr "" -#: ../src/dialogs.c:622 +#: ../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 "不要儲存(_D)" -#: ../src/dialogs.c:653 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "" -#: ../src/dialogs.c:655 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "離開前您要存檔嗎?" -#: ../src/dialogs.c:730 +#: ../src/dialogs.c:764 msgid "Choose font" msgstr "選擇字型" -#: ../src/dialogs.c:971 +#: ../src/dialogs.c:1005 msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "" -#: ../src/dialogs.c:990 ../src/dialogs.c:991 ../src/dialogs.c:992 -#: ../src/dialogs.c:998 ../src/dialogs.c:999 ../src/dialogs.c:1000 -#: ../src/symbols.c:1664 ../src/symbols.c:1685 ../src/symbols.c:1737 -#: ../src/ui_utils.c:222 +#: ../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 "不詳" -#: ../src/dialogs.c:1005 ../src/symbols.c:754 +#: ../src/dialogs.c:1039 ../src/symbols.c:780 msgid "Properties" msgstr "屬性" -#: ../src/dialogs.c:1036 +#: ../src/dialogs.c:1070 msgid "Type:" msgstr "類型:" -#: ../src/dialogs.c:1050 +#: ../src/dialogs.c:1084 msgid "Size:" msgstr "大小:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1100 msgid "Location:" msgstr "位置:" -#: ../src/dialogs.c:1080 +#: ../src/dialogs.c:1114 msgid "Read-only:" msgstr "唯讀:" -#: ../src/dialogs.c:1087 +#: ../src/dialogs.c:1121 msgid "(only inside Geany)" msgstr "" -#: ../src/dialogs.c:1096 +#: ../src/dialogs.c:1130 msgid "Encoding:" msgstr "編碼:" #. BOM = byte order mark -#: ../src/dialogs.c:1106 ../src/ui_utils.c:225 +#: ../src/dialogs.c:1140 ../src/ui_utils.c:219 msgid "(with BOM)" msgstr "" -#: ../src/dialogs.c:1106 +#: ../src/dialogs.c:1140 msgid "(without BOM)" msgstr "" -#: ../src/dialogs.c:1117 +#: ../src/dialogs.c:1151 msgid "Modified:" msgstr "修改時間:" -#: ../src/dialogs.c:1131 +#: ../src/dialogs.c:1165 msgid "Changed:" msgstr "變更:" -#: ../src/dialogs.c:1145 +#: ../src/dialogs.c:1179 msgid "Accessed:" msgstr "存取時間:" -#: ../src/dialogs.c:1167 +#: ../src/dialogs.c:1201 msgid "Permissions:" msgstr "權限:" #. Header -#: ../src/dialogs.c:1175 +#: ../src/dialogs.c:1209 msgid "Read:" msgstr "讀取:" -#: ../src/dialogs.c:1182 +#: ../src/dialogs.c:1216 msgid "Write:" msgstr "寫入:" #. Owner -#: ../src/dialogs.c:1197 +#: ../src/dialogs.c:1231 msgid "Owner:" msgstr "擁有者:" #. Group -#: ../src/dialogs.c:1233 +#: ../src/dialogs.c:1267 msgid "Group:" msgstr "群組:" #. Other -#: ../src/dialogs.c:1269 +#: ../src/dialogs.c:1303 msgid "Other:" msgstr "其他:" -#: ../src/document.c:674 +#: ../src/document.c:622 #, c-format msgid "File %s closed." msgstr "" -#: ../src/document.c:791 +#: ../src/document.c:745 #, c-format msgid "New file \"%s\" opened." msgstr "" -#: ../src/document.c:964 ../src/document.c:1470 +#: ../src/document.c:918 ../src/document.c:1421 #, c-format msgid "Could not open file %s (%s)" msgstr "無法開啟檔案%s(%s)" -#: ../src/document.c:994 +#: ../src/document.c:948 #, c-format msgid "" "The file \"%s\" could not be opened properly and has been truncated. This " @@ -608,155 +633,146 @@ #. For translators: the second wildcard is an encoding name, e.g. #. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1020 +#: ../src/document.c:974 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "" -#: ../src/document.c:1030 +#: ../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 "" -#: ../src/document.c:1168 +#: ../src/document.c:1122 #, fuzzy msgid "Spaces" msgstr "命名空間" -#: ../src/document.c:1171 +#: ../src/document.c:1125 msgid "Tabs" msgstr "" -#: ../src/document.c:1174 +#: ../src/document.c:1128 #, 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:1179 +#: ../src/document.c:1133 #, fuzzy, c-format msgid "Setting %s indentation mode for %s." msgstr "自動縮排" -#: ../src/document.c:1232 +#: ../src/document.c:1186 msgid "Invalid filename" msgstr "無效的檔案名稱" -#: ../src/document.c:1352 +#: ../src/document.c:1309 #, c-format msgid "File %s reloaded." msgstr "" -#: ../src/document.c:1354 +#. 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 "" -#: ../src/document.c:1356 +#: ../src/document.c:1316 msgid ", read-only" msgstr ",唯讀" -#: ../src/document.c:1561 +#: ../src/document.c:1512 #, fuzzy msgid "Error renaming file." msgstr "儲存檔案時出現錯誤." -#: ../src/document.c:1636 +#: ../src/document.c:1587 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " "remains unsaved." msgstr "" -#: ../src/document.c:1658 +#: ../src/document.c:1609 #, c-format msgid "" "Error message: %s\n" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" -#: ../src/document.c:1663 +#: ../src/document.c:1614 #, fuzzy, c-format msgid "Error message: %s." msgstr "儲存檔案( %s)時出現錯誤." -#: ../src/document.c:1763 ../src/document.c:1823 +#: ../src/document.c:1715 ../src/document.c:1775 msgid "Error saving file." msgstr "儲存檔案時出現錯誤." -#: ../src/document.c:1822 +#: ../src/document.c:1774 #, c-format msgid "Error saving file (%s)." msgstr "儲存檔案( %s)時出現錯誤." -#: ../src/document.c:1847 +#: ../src/document.c:1799 #, c-format msgid "File %s saved." msgstr "檔案%s已儲存." -#: ../src/document.c:1913 ../src/document.c:1970 ../src/document.c:1978 +#: ../src/document.c:1867 ../src/document.c:1924 ../src/document.c:1932 #, c-format msgid "\"%s\" was not found." msgstr "" -#: ../src/document.c:1978 +#: ../src/document.c:1932 msgid "Wrap search and find again?" msgstr "" -#: ../src/document.c:2057 ../src/search.c:1065 ../src/search.c:1669 -#: ../src/search.c:1670 +#: ../src/document.c:2011 ../src/search.c:1084 ../src/search.c:1688 +#: ../src/search.c:1689 #, fuzzy, c-format msgid "No matches found for \"%s\"." msgstr "找不到符合「%s」的內容." -#: ../src/document.c:2068 ../src/document.c:2077 +#: ../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] "" msgstr[1] "" -#: ../src/document.c:2899 +#: ../src/document.c:2868 msgid "Do you want to reload it?" msgstr "" -#: ../src/document.c:2900 +#: ../src/document.c:2869 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." msgstr "" -#: ../src/document.c:2921 +#: ../src/document.c:2890 msgid "Try to resave the file?" msgstr "" -#: ../src/document.c:2922 +#: ../src/document.c:2891 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "" -#: ../src/editor.c:3852 ../src/utils.c:295 -msgid "Win (CRLF)" -msgstr "" - -#: ../src/editor.c:3853 ../src/utils.c:296 -msgid "Mac (CR)" -msgstr "" - -#: ../src/editor.c:3854 ../src/utils.c:297 -msgid "Unix (LF)" -msgstr "" - -#: ../src/editor.c:3978 +#: ../src/editor.c:4288 #, fuzzy msgid "Enter Tab Width" msgstr "Tab字符寬度：" -#: ../src/editor.c:3979 +#: ../src/editor.c:4289 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" @@ -857,135 +873,124 @@ msgstr "中文（正體）" #: ../src/encodings.c:138 ../src/encodings.c:139 ../src/encodings.c:140 +#: ../src/encodings.c:141 msgid "Japanese" msgstr "日文" -#: ../src/encodings.c:141 ../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 "韓文" -#: ../src/encodings.c:146 +#: ../src/encodings.c:147 msgid "Without encoding" msgstr "沒有編碼" -#: ../src/encodings.c:373 +#: ../src/encodings.c:374 msgid "_West European" msgstr "西歐語系(_W)" -#: ../src/encodings.c:379 +#: ../src/encodings.c:380 msgid "_East European" msgstr "東歐語系(_E)" -#: ../src/encodings.c:385 +#: ../src/encodings.c:386 msgid "East _Asian" msgstr "東亞語系(_A)" -#: ../src/encodings.c:391 +#: ../src/encodings.c:392 msgid "_SE & SW Asian" msgstr "東南亞及西南亞語系(_S)" -#: ../src/encodings.c:397 +#: ../src/encodings.c:398 msgid "_Middle Eastern" msgstr "中東語系(_M)" -#: ../src/encodings.c:403 +#: ../src/encodings.c:404 msgid "_Unicode" msgstr "萬國碼(_U)" -#: ../src/filetypes.c:90 ../src/filetypes.c:91 ../src/interface.c:3457 -#: ../src/interface.c:5005 -msgid "None" -msgstr "無" - -#: ../src/filetypes.c:102 ../src/filetypes.c:113 ../src/filetypes.c:125 -#: ../src/filetypes.c:136 ../src/filetypes.c:147 ../src/filetypes.c:158 -#: ../src/filetypes.c:169 ../src/filetypes.c:181 ../src/filetypes.c:192 -#: ../src/filetypes.c:203 ../src/filetypes.c:214 ../src/filetypes.c:225 -#: ../src/filetypes.c:236 ../src/filetypes.c:247 ../src/filetypes.c:259 -#: ../src/filetypes.c:271 ../src/filetypes.c:282 ../src/filetypes.c:293 -#: ../src/filetypes.c:304 ../src/filetypes.c:315 ../src/filetypes.c:326 -#: ../src/filetypes.c:337 ../src/filetypes.c:384 ../src/filetypes.c:395 -#: ../src/filetypes.c:429 ../src/filetypes.c:440 ../src/filetypes.c:485 -#: ../src/filetypes.c:496 ../src/filetypes.c:530 ../src/filetypes.c:541 -#: ../src/filetypes.c:552 ../src/filetypes.c:563 ../src/filetypes.c:574 +#: ../src/filetypes.c:96 ../src/filetypes.c:204 ../src/filetypes.c:226 +#: ../src/filetypes.c:237 ../src/filetypes.c:259 #, fuzzy, c-format msgid "%s source file" msgstr "C 原始檔" -#: ../src/filetypes.c:348 +#: ../src/filetypes.c:97 +#, fuzzy, c-format +msgid "%s file" +msgstr "C 原始檔" + +#: ../src/filetypes.c:113 ../src/filetypes.c:114 ../src/interface.c:3501 +#: ../src/interface.c:5069 +msgid "None" +msgstr "無" + +#: ../src/filetypes.c:382 msgid "Shell script file" msgstr "" -#: ../src/filetypes.c:360 +#: ../src/filetypes.c:394 msgid "Makefile" msgstr "" -#: ../src/filetypes.c:372 +#: ../src/filetypes.c:406 #, fuzzy msgid "XML document" msgstr "整個文件" -#: ../src/filetypes.c:407 +#: ../src/filetypes.c:441 msgid "Cascading StyleSheet" msgstr "" -#: ../src/filetypes.c:418 +#: ../src/filetypes.c:452 msgid "SQL Dump file" msgstr "" -#: ../src/filetypes.c:451 -msgid "Diff file" -msgstr "差異檔" - -#: ../src/filetypes.c:462 +#: ../src/filetypes.c:496 msgid "Config file" msgstr "設定檔" -#: ../src/filetypes.c:474 +#: ../src/filetypes.c:508 #, fuzzy msgid "Gettext translation file" msgstr "翻譯維護者" -#: ../src/filetypes.c:507 +#: ../src/filetypes.c:541 #, fuzzy, c-format msgid "%s script file" msgstr "C 原始檔" -#: ../src/filetypes.c:518 -msgid "reStructuredText file" -msgstr "" - -#: ../src/filetypes.c:697 +#: ../src/filetypes.c:738 msgid "_Programming Languages" msgstr "" -#: ../src/filetypes.c:698 +#: ../src/filetypes.c:739 msgid "_Scripting Languages" msgstr "" -#: ../src/filetypes.c:699 +#: ../src/filetypes.c:740 msgid "_Markup Languages" msgstr "" -#: ../src/filetypes.c:700 +#: ../src/filetypes.c:741 msgid "M_iscellaneous Languages" msgstr "" -#: ../src/filetypes.c:1284 ../src/win32.c:107 +#: ../src/filetypes.c:1331 ../src/win32.c:107 msgid "All Source" msgstr "" -#: ../src/filetypes.c:1309 ../src/project.c:288 +#: ../src/filetypes.c:1356 ../src/project.c:292 msgid "All files" msgstr "所有檔案" -#: ../src/filetypes.c:1367 +#: ../src/filetypes.c:1414 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "" -#: ../src/geany.h:50 +#: ../src/geany.h:53 msgid "untitled" msgstr "未命名" @@ -1000,8 +1005,8 @@ #: ../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:2006 ../src/interface.c:2060 -#: ../src/interface.c:2074 +#: ../src/interface.c:861 ../src/interface.c:2018 ../src/interface.c:2072 +#: ../src/interface.c:2086 msgid "invisible" msgstr "隱藏" @@ -1009,7 +1014,7 @@ msgid "dummy tooltip, don't translate this." msgstr "" -#: ../src/interface.c:311 ../src/interface.c:1928 +#: ../src/interface.c:311 ../src/interface.c:1940 #, fuzzy msgid "Open Selected F_ile" msgstr "開啟檔案" @@ -1033,12 +1038,12 @@ msgid "Page Set_up" msgstr "" -#: ../src/interface.c:393 ../src/notebook.c:233 +#: ../src/interface.c:393 ../src/notebook.c:240 #, fuzzy msgid "Close Ot_her Documents" msgstr "關閉目前檔案" -#: ../src/interface.c:401 ../src/notebook.c:238 +#: ../src/interface.c:401 ../src/notebook.c:245 #, fuzzy msgid "C_lose All" msgstr "全部關閉(_l)" @@ -1047,96 +1052,92 @@ msgid "_Edit" msgstr "編輯(_E)" -#: ../src/interface.c:459 ../src/interface.c:1919 -msgid "Select _All" -msgstr "全選(_A)" - -#: ../src/interface.c:468 ../src/interface.c:1937 +#: ../src/interface.c:468 ../src/interface.c:1949 msgid "_Format" msgstr "格式(_F)" -#: ../src/interface.c:475 ../src/interface.c:1944 +#: ../src/interface.c:475 ../src/interface.c:1956 #, fuzzy msgid "T_oggle Case of Selection" msgstr "複製行或選擇區域" -#: ../src/interface.c:484 ../src/interface.c:1953 +#: ../src/interface.c:484 ../src/interface.c:1965 #, fuzzy msgid "_Comment Line(s)" msgstr "單行注釋(_C)" -#: ../src/interface.c:488 ../src/interface.c:1957 +#: ../src/interface.c:488 ../src/interface.c:1969 #, fuzzy msgid "U_ncomment Line(s)" msgstr "取消單行注釋(_n)" -#: ../src/interface.c:492 ../src/interface.c:1961 +#: ../src/interface.c:492 ../src/interface.c:1973 #, fuzzy msgid "_Toggle Line Commentation" msgstr "切換行註譯狀態(_T)" -#: ../src/interface.c:496 ../src/interface.c:1965 +#: ../src/interface.c:496 ../src/interface.c:1977 #, fuzzy msgid "Du_plicate Line or Selection" msgstr "複製行或選擇區域" -#: ../src/interface.c:505 ../src/interface.c:1974 +#: ../src/interface.c:505 ../src/interface.c:1986 msgid "_Increase Indent" msgstr "增加縮排(_I)" -#: ../src/interface.c:513 ../src/interface.c:1982 +#: ../src/interface.c:513 ../src/interface.c:1994 msgid "_Decrease Indent" msgstr "減少縮排(_D)" -#: ../src/interface.c:526 ../src/interface.c:1995 +#: ../src/interface.c:526 ../src/interface.c:2007 #, fuzzy msgid "_Send Selection to Terminal" msgstr "在選擇區域中(_l)" -#: ../src/interface.c:530 ../src/interface.c:1999 +#: ../src/interface.c:530 ../src/interface.c:2011 #, fuzzy msgid "_Send Selection to" msgstr "在選擇區域中(_l)" -#: ../src/interface.c:545 ../src/interface.c:2014 +#: ../src/interface.c:545 ../src/interface.c:2026 msgid "I_nsert Comments" msgstr "插入註解(_I)" -#: ../src/interface.c:556 ../src/interface.c:2025 +#: ../src/interface.c:556 ../src/interface.c:2037 #, fuzzy msgid "Insert _ChangeLog Entry" msgstr "插入改變記錄項目" -#: ../src/interface.c:560 ../src/interface.c:2029 +#: ../src/interface.c:560 ../src/interface.c:2041 #, fuzzy msgid "Insert File _Header" msgstr "插入檔案標頭" -#: ../src/interface.c:564 ../src/interface.c:2033 +#: ../src/interface.c:564 ../src/interface.c:2045 #, fuzzy msgid "Insert _Function Description" msgstr "插入函數描述" -#: ../src/interface.c:568 ../src/interface.c:2037 +#: ../src/interface.c:568 ../src/interface.c:2049 #, fuzzy msgid "Insert _Multiline Comment" msgstr "插入多列註釋" -#: ../src/interface.c:572 ../src/interface.c:2041 +#: ../src/interface.c:572 ../src/interface.c:2053 #, fuzzy msgid "Insert _GPL Notice" msgstr "插入GPL宣告" -#: ../src/interface.c:576 ../src/interface.c:2045 +#: ../src/interface.c:576 ../src/interface.c:2057 #, fuzzy msgid "Insert _BSD License Notice" msgstr "插入GPL宣告" -#: ../src/interface.c:580 ../src/interface.c:2049 +#: ../src/interface.c:580 ../src/interface.c:2061 msgid "Insert Dat_e" msgstr "插入日期(_e)" -#: ../src/interface.c:594 ../src/interface.c:2063 +#: ../src/interface.c:594 ../src/interface.c:2075 msgid "_Insert \"include <...>\"" msgstr "插入\"include <...>\"(_I)" @@ -1162,7 +1163,7 @@ msgid "Find in F_iles" msgstr "在一系列檔案中尋找(_i)" -#: ../src/interface.c:644 ../src/search.c:509 +#: ../src/interface.c:644 ../src/search.c:524 msgid "_Replace" msgstr "取代(_R)" @@ -1186,7 +1187,7 @@ msgid "Pr_evious Message" msgstr "訊息" -#: ../src/interface.c:683 ../src/interface.c:2115 +#: ../src/interface.c:683 ../src/interface.c:2127 #, fuzzy msgid "_Go to Line" msgstr "前往行數(_G)" @@ -1216,7 +1217,7 @@ msgid "Show Side_bar" msgstr "顯示側邊欄(_b)" -#: ../src/interface.c:734 ../src/interface.c:3865 ../src/keybindings.c:227 +#: ../src/interface.c:734 ../src/interface.c:3917 ../src/keybindings.c:229 msgid "Editor" msgstr "編輯器" @@ -1266,16 +1267,16 @@ msgid "In_dent Type" msgstr "" -#: ../src/interface.c:808 ../src/interface.c:3496 ../src/interface.c:5044 +#: ../src/interface.c:808 ../src/interface.c:3540 ../src/interface.c:5108 msgid "_Tabs" msgstr "" -#: ../src/interface.c:814 ../src/interface.c:3487 ../src/interface.c:5035 +#: ../src/interface.c:814 ../src/interface.c:3531 ../src/interface.c:5099 #, fuzzy msgid "_Spaces" msgstr "命名空間" -#: ../src/interface.c:820 ../src/interface.c:3505 ../src/interface.c:5053 +#: ../src/interface.c:820 ../src/interface.c:3549 ../src/interface.c:5117 #, fuzzy msgid "T_abs and Spaces" msgstr "置換tab字元為空白(_R)" @@ -1415,7 +1416,7 @@ msgid "_Debug Messages" msgstr "訊息" -#: ../src/interface.c:1073 ../src/treeviews.c:114 +#: ../src/interface.c:1073 ../src/treeviews.c:119 msgid "Symbols" msgstr "符號" @@ -1440,252 +1441,257 @@ msgid "Scribble" msgstr "" -#: ../src/interface.c:1725 ../src/interface.c:3266 +#: ../src/interface.c:1727 ../src/interface.c:3286 #, fuzzy msgid "Images _and Text" msgstr "圖示及文字" -#: ../src/interface.c:1731 ../src/interface.c:3298 +#: ../src/interface.c:1732 ../src/interface.c:3318 #, fuzzy msgid "_Images Only" msgstr "只顯示圖示" -#: ../src/interface.c:1737 ../src/interface.c:3290 +#: ../src/interface.c:1737 ../src/interface.c:3310 #, fuzzy msgid "_Text Only" msgstr "只顯示文字" -#: ../src/interface.c:1748 ../src/interface.c:3282 +#: ../src/interface.c:1748 ../src/interface.c:3302 #, fuzzy msgid "_Large Icons" msgstr "大型圖示" -#: ../src/interface.c:1754 ../src/interface.c:3274 +#: ../src/interface.c:1753 ../src/interface.c:3294 #, fuzzy msgid "_Small Icons" msgstr "小型圖示" -#: ../src/interface.c:1760 ../src/interface.c:3306 +#: ../src/interface.c:1758 ../src/interface.c:3326 #, fuzzy msgid "_Very Small Icons" msgstr "小型圖示" -#: ../src/interface.c:1770 +#: ../src/interface.c:1769 #, fuzzy -msgid "_Hide toolbar" +msgid "_Customize Toolbar" msgstr "隱藏工具列" -#: ../src/interface.c:2082 +#: ../src/interface.c:1777 +#, fuzzy +msgid "_Hide Toolbar" +msgstr "隱藏工具列" + +#: ../src/interface.c:2094 #, fuzzy msgid "Find _Usage" msgstr "尋找用法" -#: ../src/interface.c:2090 +#: ../src/interface.c:2102 #, fuzzy msgid "Find _Document Usage" msgstr "尋找用法" -#: ../src/interface.c:2098 +#: ../src/interface.c:2110 #, fuzzy msgid "Go to _Tag Definition" msgstr "前往輸入的行數" -#: ../src/interface.c:2102 +#: ../src/interface.c:2114 #, fuzzy msgid "Go to T_ag Declaration" msgstr "前往輸入的行數" -#: ../src/interface.c:2106 +#: ../src/interface.c:2118 #, fuzzy msgid "Conte_xt Action" msgstr "在選擇區域中(_l)" -#: ../src/interface.c:2647 ../src/keybindings.c:330 +#: ../src/interface.c:2667 ../src/keybindings.c:337 msgid "Preferences" msgstr "偏好設定" -#: ../src/interface.c:2683 +#: ../src/interface.c:2703 msgid "Load files from the last session" msgstr "" -#: ../src/interface.c:2686 +#: ../src/interface.c:2706 msgid "Opens at startup the files from the last session" msgstr "" -#: ../src/interface.c:2688 +#: ../src/interface.c:2708 #, fuzzy msgid "Load virtual terminal support" msgstr "不要載入終端機支援" -#: ../src/interface.c:2690 +#: ../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 "" -#: ../src/interface.c:2692 +#: ../src/interface.c:2712 msgid "Enable plugin support" msgstr "" -#: ../src/interface.c:2696 +#: ../src/interface.c:2716 #, fuzzy msgid "Startup" msgstr "側面欄" -#: ../src/interface.c:2715 +#: ../src/interface.c:2735 msgid "Save window position and geometry" msgstr "" -#: ../src/interface.c:2718 +#: ../src/interface.c:2738 msgid "Saves the window position and geometry and restores it at the start" msgstr "" -#: ../src/interface.c:2720 +#: ../src/interface.c:2740 msgid "Confirm exit" msgstr "確定離開" -#: ../src/interface.c:2723 +#: ../src/interface.c:2743 #, fuzzy msgid "Shows a confirmation dialog on exit" msgstr "顯示版本號並離開" -#: ../src/interface.c:2725 +#: ../src/interface.c:2745 #, fuzzy msgid "Shutdown" msgstr "字型" -#: ../src/interface.c:2746 +#: ../src/interface.c:2766 msgid "Startup path:" msgstr "" -#: ../src/interface.c:2758 +#: ../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 "" -#: ../src/interface.c:2771 +#: ../src/interface.c:2791 #, fuzzy msgid "Project files:" msgstr "屬性" -#: ../src/interface.c:2783 +#: ../src/interface.c:2803 msgid "Path to start in when opening project files" msgstr "" -#: ../src/interface.c:2796 +#: ../src/interface.c:2816 msgid "Extra plugin path:" msgstr "" -#: ../src/interface.c:2808 +#: ../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:2821 +#: ../src/interface.c:2841 #, fuzzy msgid "Paths" msgstr "字型" -#: ../src/interface.c:2826 +#: ../src/interface.c:2846 #, fuzzy msgid "Startup" msgstr "狀態" -#: ../src/interface.c:2848 +#: ../src/interface.c:2868 msgid "Beep on errors or when compilation has finished" msgstr "" -#: ../src/interface.c:2851 +#: ../src/interface.c:2871 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "" -#: ../src/interface.c:2853 +#: ../src/interface.c:2873 msgid "Switch to status message list at new message" msgstr "" -#: ../src/interface.c:2856 +#: ../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:2858 +#: ../src/interface.c:2878 msgid "Suppress status messages in the status bar" msgstr "" -#: ../src/interface.c:2861 +#: ../src/interface.c:2881 msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." msgstr "" -#: ../src/interface.c:2863 -msgid "Auto focus widgets (focus follows mouse)" +#: ../src/interface.c:2883 +msgid "Auto-focus widgets (focus follows mouse)" msgstr "" -#: ../src/interface.c:2866 +#: ../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 "" -#: ../src/interface.c:2868 ../src/interface.c:3194 ../src/interface.c:4074 +#: ../src/interface.c:2888 ../src/interface.c:3214 ../src/interface.c:4126 #, fuzzy msgid "Miscellaneous" msgstr "顯示" -#: ../src/interface.c:2888 +#: ../src/interface.c:2908 msgid "Always wrap search and hide the Find dialog" msgstr "" -#: ../src/interface.c:2891 +#: ../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:2893 +#: ../src/interface.c:2913 msgid "Use the current word under the cursor for Find dialogs" msgstr "" -#: ../src/interface.c:2896 +#: ../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:2898 +#: ../src/interface.c:2918 #, fuzzy msgid "Use the current file's directory for Find in Files" msgstr "在檔案中尋找的目錄不合法." -#: ../src/interface.c:2902 +#: ../src/interface.c:2922 #, fuzzy msgid "Search" msgstr "側面欄" -#: ../src/interface.c:2921 +#: ../src/interface.c:2941 #, fuzzy msgid "Use project-based session files" msgstr "屬性" -#: ../src/interface.c:2924 +#: ../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:2926 +#: ../src/interface.c:2946 msgid "Store project file inside the project base directory" msgstr "" -#: ../src/interface.c:2929 +#: ../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 " @@ -1693,209 +1699,214 @@ "Project dialog." msgstr "" -#: ../src/interface.c:2931 +#: ../src/interface.c:2951 #, fuzzy msgid "Projects" msgstr "字型" -#: ../src/interface.c:2936 +#: ../src/interface.c:2956 #, fuzzy msgid "Miscellaneous" msgstr "顯示" -#: ../src/interface.c:2940 +#: ../src/interface.c:2960 msgid "General" msgstr "一般" -#: ../src/interface.c:2963 +#: ../src/interface.c:2983 msgid "Show symbol list" msgstr "顯示符號列表" -#: ../src/interface.c:2966 +#: ../src/interface.c:2986 msgid "Toggle the symbol list on and off" msgstr "開啟/關閉符號列表" -#: ../src/interface.c:2968 +#: ../src/interface.c:2988 #, fuzzy msgid "Show documents list" msgstr "顯示開啟檔案列表" -#: ../src/interface.c:2971 +#: ../src/interface.c:2991 #, fuzzy msgid "Toggle the documents list on and off" msgstr "開啟/關閉符號列表" -#: ../src/interface.c:2973 +#: ../src/interface.c:2993 msgid "Sidebar" msgstr "側面欄" -#: ../src/interface.c:2994 +#: ../src/interface.c:3014 #, fuzzy msgid "Symbol list:" msgstr "顯示符號列表" -#: ../src/interface.c:3001 ../src/interface.c:3116 +#: ../src/interface.c:3021 ../src/interface.c:3136 #, fuzzy msgid "Message window:" msgstr "訊息視窗" -#: ../src/interface.c:3008 ../src/interface.c:3152 +#: ../src/interface.c:3028 ../src/interface.c:3172 #, fuzzy msgid "Editor:" msgstr "編輯器" -#: ../src/interface.c:3020 +#: ../src/interface.c:3040 msgid "Sets the font for the message window" msgstr "" -#: ../src/interface.c:3028 +#: ../src/interface.c:3048 #, fuzzy msgid "Sets the font for the symbol list" msgstr "顯示符號列表" -#: ../src/interface.c:3036 +#: ../src/interface.c:3056 #, fuzzy msgid "Sets the editor font" msgstr "編輯器字型" -#: ../src/interface.c:3038 +#: ../src/interface.c:3058 msgid "Fonts" msgstr "字型" -#: ../src/interface.c:3057 +#: ../src/interface.c:3077 #, fuzzy msgid "Show editor tabs" msgstr "顯示檔案標籤列" -#: ../src/interface.c:3061 +#: ../src/interface.c:3081 #, fuzzy msgid "Show close buttons" msgstr "顯示顏色選擇器" -#: ../src/interface.c:3064 +#: ../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 "" -#: ../src/interface.c:3070 +#: ../src/interface.c:3090 msgid "Placement of new file tabs:" msgstr "" -#: ../src/interface.c:3075 ../src/interface.c:3129 ../src/interface.c:3147 -#: ../src/interface.c:3165 +#: ../src/interface.c:3095 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3185 msgid "Left" msgstr "左邊" -#: ../src/interface.c:3078 +#: ../src/interface.c:3098 msgid "File tabs will be placed on the left of the notebook" msgstr "" -#: ../src/interface.c:3083 ../src/interface.c:3130 ../src/interface.c:3148 -#: ../src/interface.c:3166 +#: ../src/interface.c:3103 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3186 msgid "Right" msgstr "右邊" -#: ../src/interface.c:3086 +#: ../src/interface.c:3106 msgid "File tabs will be placed on the right of the notebook" msgstr "" -#: ../src/interface.c:3090 +#: ../src/interface.c:3110 msgid "Double-clicking hides all additional widgets" msgstr "" -#: ../src/interface.c:3093 +#: ../src/interface.c:3113 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "" -#: ../src/interface.c:3095 +#: ../src/interface.c:3115 #, fuzzy msgid "Editor tabs" msgstr "字型" -#: ../src/interface.c:3131 ../src/interface.c:3149 ../src/interface.c:3167 +#: ../src/interface.c:3151 ../src/interface.c:3169 ../src/interface.c:3187 msgid "Top" msgstr "頂部" -#: ../src/interface.c:3132 ../src/interface.c:3150 ../src/interface.c:3168 +#: ../src/interface.c:3152 ../src/interface.c:3170 ../src/interface.c:3188 msgid "Bottom" msgstr "底部" -#: ../src/interface.c:3134 +#: ../src/interface.c:3154 #, fuzzy msgid "Sidebar:" msgstr "側面欄" -#: ../src/interface.c:3170 +#: ../src/interface.c:3190 #, fuzzy msgid "Tab positions" msgstr "位置:" -#: ../src/interface.c:3189 +#: ../src/interface.c:3209 #, fuzzy msgid "Show status bar" msgstr "顯示工具列" -#: ../src/interface.c:3192 +#: ../src/interface.c:3212 msgid "Whether to show the status bar at the bottom of the main window" msgstr "" -#: ../src/interface.c:3199 +#: ../src/interface.c:3219 msgid "Interface" msgstr "介面" -#: ../src/interface.c:3222 +#: ../src/interface.c:3242 #, fuzzy msgid "Show T_oolbar" msgstr "顯示工具列" -#: ../src/interface.c:3226 +#: ../src/interface.c:3246 msgid "_Append Toolbar to the Menu" msgstr "" -#: ../src/interface.c:3229 +#: ../src/interface.c:3249 msgid "Pack the toolbar to the main menu to save vertical space" msgstr "" -#: ../src/interface.c:3231 +#: ../src/interface.c:3251 #, fuzzy msgid "Toolbar" msgstr "字型" -#: ../src/interface.c:3252 +#: ../src/interface.c:3272 #, fuzzy msgid "Icon style:" msgstr "圖示風格" -#: ../src/interface.c:3259 +#: ../src/interface.c:3279 #, fuzzy msgid "Icon size:" msgstr "圖示大小" -#: ../src/interface.c:3314 +#: ../src/interface.c:3334 msgid "Appearance" msgstr "外觀" -#: ../src/interface.c:3319 +#: ../src/interface.c:3359 ../src/toolbar.c:881 +#, fuzzy +msgid "Customize Toolbar" +msgstr "顯示工具列(_T)" + +#: ../src/interface.c:3363 msgid "Toolbar" msgstr "工具列" -#: ../src/interface.c:3346 +#: ../src/interface.c:3390 msgid "Line wrapping" msgstr "換行" -#: ../src/interface.c:3349 +#: ../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 "" -#: ../src/interface.c:3351 +#: ../src/interface.c:3395 msgid "Enable \"smart\" home key" msgstr "" -#: ../src/interface.c:3354 +#: ../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 " @@ -1904,553 +1915,562 @@ "its current position." msgstr "" -#: ../src/interface.c:3356 +#: ../src/interface.c:3400 msgid "Disable Drag and Drop" msgstr "" -#: ../src/interface.c:3359 +#: ../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 "" -#: ../src/interface.c:3361 +#: ../src/interface.c:3405 msgid "Enable folding" msgstr "啟用摺疊功能" -#: ../src/interface.c:3364 +#: ../src/interface.c:3408 msgid "Whether to enable folding the code" msgstr "要不要啟用程式碼的摺疊功能" -#: ../src/interface.c:3366 +#: ../src/interface.c:3410 msgid "Fold/unfold all children of a fold point" msgstr "" -#: ../src/interface.c:3369 +#: ../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 "" -#: ../src/interface.c:3371 +#: ../src/interface.c:3415 msgid "Use indicators to show compile errors" msgstr "" -#: ../src/interface.c:3374 +#: ../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 "" -#: ../src/interface.c:3376 +#: ../src/interface.c:3420 msgid "Newline strips trailing spaces" msgstr "" -#: ../src/interface.c:3379 +#: ../src/interface.c:3423 msgid "Enable newline to strip the trailing spaces on the previous line" msgstr "" -#: ../src/interface.c:3385 +#: ../src/interface.c:3429 msgid "Line breaking column:" msgstr "" -#: ../src/interface.c:3399 +#: ../src/interface.c:3443 #, fuzzy msgid "Comment toggle marker:" msgstr "開啟側邊欄" -#: ../src/interface.c:3406 +#: ../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 "" -#: ../src/interface.c:3408 +#: ../src/interface.c:3452 msgid "Features" msgstr "功能" -#: ../src/interface.c:3413 +#: ../src/interface.c:3457 #, fuzzy msgid "Features" msgstr "功能" -#: ../src/interface.c:3445 ../src/interface.c:4993 +#: ../src/interface.c:3489 ../src/interface.c:5057 #, fuzzy msgid "Auto-indent mode:" msgstr "自動縮排" -#: ../src/interface.c:3458 ../src/interface.c:5006 +#: ../src/interface.c:3502 ../src/interface.c:5070 #, fuzzy msgid "Basic" msgstr "波羅的海語" -#: ../src/interface.c:3459 ../src/interface.c:5007 +#: ../src/interface.c:3503 ../src/interface.c:5071 msgid "Current chars" msgstr "" -#: ../src/interface.c:3460 ../src/interface.c:5008 +#: ../src/interface.c:3504 ../src/interface.c:5072 #, fuzzy msgid "Match braces" msgstr "跳至對應括號" -#: ../src/interface.c:3462 ../src/interface.c:3805 ../src/interface.c:5010 +#: ../src/interface.c:3506 ../src/interface.c:3857 ../src/interface.c:5074 #, fuzzy msgid "Type:" msgstr "型態" -#: ../src/interface.c:3469 ../src/interface.c:5017 +#: ../src/interface.c:3513 ../src/interface.c:5081 #, fuzzy msgid "Width:" msgstr "寫入:" -#: ../src/interface.c:3482 ../src/interface.c:5030 +#: ../src/interface.c:3526 ../src/interface.c:5094 msgid "The width in chars of a single indent" msgstr "" -#: ../src/interface.c:3492 ../src/interface.c:5040 +#: ../src/interface.c:3536 ../src/interface.c:5104 msgid "Use spaces when inserting indentation" msgstr "" -#: ../src/interface.c:3501 ../src/interface.c:5049 +#: ../src/interface.c:3545 ../src/interface.c:5113 msgid "Use one tab per indent" msgstr "" -#: ../src/interface.c:3510 ../src/interface.c:5058 +#: ../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 "" -#: ../src/interface.c:3525 ../src/interface.c:5073 +#: ../src/interface.c:3569 ../src/interface.c:5137 #, fuzzy msgid "Hard tab width:" msgstr "Tab字符寬度：" -#: ../src/interface.c:3533 ../src/interface.c:5081 +#: ../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:3543 ../src/interface.c:5091 +#: ../src/interface.c:3587 ../src/interface.c:5155 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -#: ../src/interface.c:3545 +#: ../src/interface.c:3589 #, fuzzy msgid "Tab key indents" msgstr "增加縮排" -#: ../src/interface.c:3548 +#: ../src/interface.c:3592 msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -#: ../src/interface.c:3550 +#: ../src/interface.c:3594 #, fuzzy msgid "Indentation" msgstr "位置:" -#: ../src/interface.c:3555 ../src/interface.c:5093 +#: ../src/interface.c:3599 ../src/interface.c:5157 #, fuzzy msgid "Indentation" msgstr "位置:" -#: ../src/interface.c:3578 +#: ../src/interface.c:3622 #, fuzzy msgid "Snippet completion" msgstr "XML標籤自動補完" -#: ../src/interface.c:3581 +#: ../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:3583 +#: ../src/interface.c:3627 #, fuzzy -msgid "XML tag auto completion" +msgid "XML tag autocompletion" msgstr "XML標籤自動補完" -#: ../src/interface.c:3586 +#: ../src/interface.c:3630 msgid "Automatic completion and closing of XML tags (includes HTML tags)" msgstr "" -#: ../src/interface.c:3588 +#: ../src/interface.c:3632 msgid "Automatic continuation of multi-line comments" msgstr "" -#: ../src/interface.c:3591 +#: ../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 "" -#: ../src/interface.c:3593 -#, fuzzy -msgid "Automatic symbol completion" -msgstr "XML標籤自動補完" +#: ../src/interface.c:3637 +msgid "Autocomplete symbols" +msgstr "" -#: ../src/interface.c:3596 +#: ../src/interface.c:3640 msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "" -#: ../src/interface.c:3604 +#: ../src/interface.c:3642 +msgid "Autocomplete all words in document" +msgstr "" + +#: ../src/interface.c:3646 +#, fuzzy +msgid "Drop rest of word on completion" +msgstr "XML標籤自動補完" + +#: ../src/interface.c:3656 msgid "Max. symbol name suggestions:" msgstr "" -#: ../src/interface.c:3611 +#: ../src/interface.c:3663 msgid "Completion list height:" msgstr "" -#: ../src/interface.c:3618 -msgid "Characters to type for completion:" -msgstr "" +#: ../src/interface.c:3670 +#, fuzzy +msgid "Characters to type for autocompletion:" +msgstr "XML標籤自動補完" -#: ../src/interface.c:3631 +#: ../src/interface.c:3683 msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "" -#: ../src/interface.c:3640 -msgid "Display height in rows for the auto completion list" +#: ../src/interface.c:3692 +msgid "Display height in rows for the autocompletion list" msgstr "" -#: ../src/interface.c:3649 -msgid "Maximum number of entries to display in the auto completion list" +#: ../src/interface.c:3701 +msgid "Maximum number of entries to display in the autocompletion list" msgstr "" -#: ../src/interface.c:3652 +#: ../src/interface.c:3704 #, fuzzy msgid "Completions" msgstr "位置:" -#: ../src/interface.c:3672 +#: ../src/interface.c:3724 msgid "Parenthesis ( )" msgstr "" -#: ../src/interface.c:3677 +#: ../src/interface.c:3729 msgid "Auto-close parenthesis when typing an opening one" msgstr "" -#: ../src/interface.c:3679 +#: ../src/interface.c:3731 msgid "Single quotes ' '" msgstr "" -#: ../src/interface.c:3684 +#: ../src/interface.c:3736 msgid "Auto-close simple quote when typing an opening one" msgstr "" -#: ../src/interface.c:3686 +#: ../src/interface.c:3738 msgid "Curly brackets { }" msgstr "" -#: ../src/interface.c:3691 +#: ../src/interface.c:3743 msgid "Auto-close curly bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3693 +#: ../src/interface.c:3745 msgid "Square brackets [ ]" msgstr "" -#: ../src/interface.c:3698 +#: ../src/interface.c:3750 msgid "Auto-close square-bracket when typing an opening one" msgstr "" -#: ../src/interface.c:3700 +#: ../src/interface.c:3752 msgid "Double quotes \" \"" msgstr "" -#: ../src/interface.c:3705 +#: ../src/interface.c:3757 msgid "Auto-close double quote when typing an opening one" msgstr "" -#: ../src/interface.c:3707 +#: ../src/interface.c:3759 msgid "Auto-close quotes and brackets" msgstr "" -#: ../src/interface.c:3712 +#: ../src/interface.c:3764 #, fuzzy msgid "Completions" msgstr "位置:" -#: ../src/interface.c:3735 +#: ../src/interface.c:3787 msgid "Invert syntax highlighting colors" msgstr "" -#: ../src/interface.c:3738 +#: ../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:3740 +#: ../src/interface.c:3792 msgid "Show indentation guides" msgstr "" -#: ../src/interface.c:3743 +#: ../src/interface.c:3795 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" -#: ../src/interface.c:3745 +#: ../src/interface.c:3797 msgid "Show white space" msgstr "顯示空白字元" -#: ../src/interface.c:3748 +#: ../src/interface.c:3800 msgid "Marks spaces with dots and tabs with arrows" msgstr "" -#: ../src/interface.c:3750 +#: ../src/interface.c:3802 msgid "Show line endings" msgstr "顯示行尾" -#: ../src/interface.c:3753 +#: ../src/interface.c:3805 #, fuzzy msgid "Shows the line ending character" msgstr "顯示行結束字元" -#: ../src/interface.c:3755 +#: ../src/interface.c:3807 #, fuzzy msgid "Show line numbers" msgstr "顯示行號(_L)" -#: ../src/interface.c:3758 +#: ../src/interface.c:3810 msgid "Shows or hides the Line Number margin" msgstr "" -#: ../src/interface.c:3760 +#: ../src/interface.c:3812 msgid "Show markers margin" msgstr "" -#: ../src/interface.c:3763 +#: ../src/interface.c:3815 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "" -#: ../src/interface.c:3765 +#: ../src/interface.c:3817 #, fuzzy msgid "Stop scrolling at last line" msgstr "編譯目前檔案" -#: ../src/interface.c:3768 +#: ../src/interface.c:3820 msgid "Whether to stop scrolling one page past the last line of a document" msgstr "" -#: ../src/interface.c:3770 +#: ../src/interface.c:3822 msgid "Display" msgstr "顯示" -#: ../src/interface.c:3791 +#: ../src/interface.c:3843 msgid "Long line marker:" msgstr "" -#: ../src/interface.c:3798 +#: ../src/interface.c:3850 msgid "Long line marker color:" msgstr "" -#: ../src/interface.c:3817 +#: ../src/interface.c:3869 msgid "Sets the color of the long line marker" msgstr "" -#: ../src/interface.c:3818 ../src/toolbar.c:66 ../src/tools.c:746 +#: ../src/interface.c:3870 ../src/toolbar.c:70 ../src/tools.c:746 #: ../src/vte.c:769 ../src/vte.c:776 msgid "Color Chooser" msgstr "顏色選擇程式" -#: ../src/interface.c:3826 +#: ../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 "" -#: ../src/interface.c:3836 +#: ../src/interface.c:3888 msgid "Line" msgstr "行" -#: ../src/interface.c:3839 +#: ../src/interface.c:3891 msgid "" "Prints a vertical line in the editor window at the given cursor position " "(see below)" msgstr "" -#: ../src/interface.c:3843 +#: ../src/interface.c:3895 msgid "Background" msgstr "背景" -#: ../src/interface.c:3846 +#: ../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 "" -#: ../src/interface.c:3850 +#: ../src/interface.c:3902 msgid "Disabled" msgstr "已停用" -#: ../src/interface.c:3856 +#: ../src/interface.c:3908 msgid "Long line marker" msgstr "" -#: ../src/interface.c:3861 +#: ../src/interface.c:3913 #, fuzzy msgid "Display" msgstr "顯示" -#: ../src/interface.c:3892 +#: ../src/interface.c:3944 msgid "Open new documents from the command-line" msgstr "" -#: ../src/interface.c:3895 +#: ../src/interface.c:3947 msgid "Start a new file for each command-line filename that doesn't exist" msgstr "" -#: ../src/interface.c:3909 +#: ../src/interface.c:3961 #, fuzzy msgid "Default end of line characters:" msgstr "預設編碼:" -#: ../src/interface.c:3916 +#: ../src/interface.c:3968 msgid "New files" msgstr "新的檔案" -#: ../src/interface.c:3942 +#: ../src/interface.c:3994 #, fuzzy msgid "Sets the default encoding for newly created files" msgstr "預設編碼:" -#: ../src/interface.c:3948 +#: ../src/interface.c:4000 #, fuzzy msgid "Default encoding (new files):" msgstr "預設編碼:" -#: ../src/interface.c:3955 +#: ../src/interface.c:4007 #, fuzzy msgid "Default encoding (existing files):" msgstr "預設編碼:" -#: ../src/interface.c:3967 +#: ../src/interface.c:4019 #, fuzzy msgid "Sets the default encoding for opening existing files" msgstr "預設編碼:" -#: ../src/interface.c:3973 +#: ../src/interface.c:4025 msgid "Use fixed encoding when opening files" msgstr "" -#: ../src/interface.c:3978 +#: ../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:3980 +#: ../src/interface.c:4032 #, fuzzy msgid "Encodings" msgstr "編碼:" -#: ../src/interface.c:3999 +#: ../src/interface.c:4051 msgid "Ensure new line at file end" msgstr "" -#: ../src/interface.c:4002 +#: ../src/interface.c:4054 msgid "Ensures that at the end of the file is a new line" msgstr "" -#: ../src/interface.c:4004 +#: ../src/interface.c:4056 #, fuzzy msgid "Strip trailing spaces and tabs" msgstr "移除每行結束的空白及tab字元" -#: ../src/interface.c:4007 +#: ../src/interface.c:4059 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "移除每行結束的空白及tab字元" -#: ../src/interface.c:4009 ../src/keybindings.c:449 +#: ../src/interface.c:4061 ../src/keybindings.c:460 msgid "Replace tabs by space" msgstr "以空白字元替代tab字元" -#: ../src/interface.c:4012 +#: ../src/interface.c:4064 #, fuzzy msgid "Replaces all tabs in document by spaces" msgstr "以空白字元替代tab字元" -#: ../src/interface.c:4014 +#: ../src/interface.c:4066 msgid "Saving files" msgstr "儲存檔案" -#: ../src/interface.c:4039 +#: ../src/interface.c:4091 msgid "Recent files list length:" msgstr "最近使用檔案清單長度:" -#: ../src/interface.c:4053 +#: ../src/interface.c:4105 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "" -#: ../src/interface.c:4057 +#: ../src/interface.c:4109 msgid "Disk check timeout:" msgstr "" -#: ../src/interface.c:4070 +#: ../src/interface.c:4122 msgid "" "How often to check for changes to document files on disk, in seconds. Zero " "disables checking." msgstr "" -#: ../src/interface.c:4079 ../src/symbols.c:574 ../plugins/filebrowser.c:1016 +#: ../src/interface.c:4131 ../src/symbols.c:590 ../plugins/filebrowser.c:1013 msgid "Files" msgstr "檔案" -#: ../src/interface.c:4112 +#: ../src/interface.c:4164 #, fuzzy msgid "Make:" msgstr "建立全部" -#: ../src/interface.c:4119 +#: ../src/interface.c:4171 #, fuzzy msgid "Terminal:" msgstr "終端機" -#: ../src/interface.c:4126 +#: ../src/interface.c:4178 #, fuzzy msgid "Browser:" msgstr "瀏覽器" -#: ../src/interface.c:4138 +#: ../src/interface.c:4190 msgid "Path and options for the make tool" msgstr "" -#: ../src/interface.c:4145 +#: ../src/interface.c:4197 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" msgstr "" -#: ../src/interface.c:4152 +#: ../src/interface.c:4204 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" -#: ../src/interface.c:4184 +#: ../src/interface.c:4236 #, fuzzy msgid "Grep:" msgstr "群組:" -#: ../src/interface.c:4207 +#: ../src/interface.c:4259 #, fuzzy msgid "Tool paths" msgstr "字型" -#: ../src/interface.c:4228 +#: ../src/interface.c:4280 #, fuzzy msgid "Context action:" msgstr "在選擇區域中(_l)" -#: ../src/interface.c:4239 +#: ../src/interface.c:4291 #, c-format msgid "" "Context action command. The currently selected word can be used with %s. It " @@ -2458,774 +2478,793 @@ "execution." msgstr "" -#: ../src/interface.c:4252 +#: ../src/interface.c:4304 #, fuzzy msgid "Commands" msgstr "字型" -#: ../src/interface.c:4257 ../src/keybindings.c:485 +#: ../src/interface.c:4309 ../src/keybindings.c:496 msgid "Tools" msgstr "工具箱" -#: ../src/interface.c:4291 +#: ../src/interface.c:4343 msgid "email address of the developer" msgstr "" -#: ../src/interface.c:4298 +#: ../src/interface.c:4350 msgid "Initials of the developer name" msgstr "" -#: ../src/interface.c:4300 +#: ../src/interface.c:4352 msgid "Initial version:" msgstr "" -#: ../src/interface.c:4312 +#: ../src/interface.c:4364 msgid "Version number, which a new file initially has" msgstr "" -#: ../src/interface.c:4319 +#: ../src/interface.c:4371 msgid "Company name" msgstr "公司名稱" -#: ../src/interface.c:4321 +#: ../src/interface.c:4373 #, fuzzy msgid "Developer:" msgstr "開發者" -#: ../src/interface.c:4328 +#: ../src/interface.c:4380 #, fuzzy msgid "Company:" msgstr "公司" -#: ../src/interface.c:4335 +#: ../src/interface.c:4387 #, fuzzy msgid "Mail address:" msgstr "電子郵件位址" -#: ../src/interface.c:4342 +#: ../src/interface.c:4394 msgid "Initials:" msgstr "" -#: ../src/interface.c:4354 +#: ../src/interface.c:4406 msgid "The name of the developer" msgstr "開發者名字" -#: ../src/interface.c:4356 +#: ../src/interface.c:4408 #, fuzzy msgid "Year:" msgstr "側面欄" -#: ../src/interface.c:4363 +#: ../src/interface.c:4415 #, fuzzy msgid "Date:" msgstr "建立全部" -#: ../src/interface.c:4370 +#: ../src/interface.c:4422 msgid "Date & Time:" msgstr "" -#: ../src/interface.c:4382 +#: ../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:4389 +#: ../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:4396 +#: ../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:4398 +#: ../src/interface.c:4450 #, fuzzy msgid "Template data" msgstr "功能" -#: ../src/interface.c:4403 +#: ../src/interface.c:4455 msgid "Templates" msgstr "範本" -#: ../src/interface.c:4441 +#: ../src/interface.c:4493 #, fuzzy msgid "C_hange" msgstr "改變" -#: ../src/interface.c:4445 +#: ../src/interface.c:4497 #, fuzzy msgid "Keyboard shortcuts" msgstr "捷徑鍵" -#: ../src/interface.c:4450 +#: ../src/interface.c:4502 msgid "Keybindings" msgstr "" -#: ../src/interface.c:4473 +#: ../src/interface.c:4525 #, fuzzy msgid "Command:" msgstr "指令" -#: ../src/interface.c:4480 +#: ../src/interface.c:4532 #, c-format msgid "Path to the command for printing files (use %f for the filename)" msgstr "" -#: ../src/interface.c:4490 +#: ../src/interface.c:4542 msgid "Use an external command for printing" msgstr "" -#: ../src/interface.c:4510 ../src/printing.c:345 +#: ../src/interface.c:4562 ../src/printing.c:380 #, fuzzy msgid "Print line numbers" msgstr "顯示行號(_L)" -#: ../src/interface.c:4513 ../src/printing.c:347 +#: ../src/interface.c:4565 ../src/printing.c:382 msgid "Add line numbers to the printed page" msgstr "" -#: ../src/interface.c:4515 ../src/printing.c:350 +#: ../src/interface.c:4567 ../src/printing.c:385 #, fuzzy msgid "Print page numbers" msgstr "顯示行號(_L)" -#: ../src/interface.c:4518 ../src/printing.c:352 +#: ../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 "" -#: ../src/interface.c:4520 ../src/printing.c:355 +#: ../src/interface.c:4572 ../src/printing.c:390 msgid "Print page header" msgstr "" -#: ../src/interface.c:4523 ../src/printing.c:357 +#: ../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 "" -#: ../src/interface.c:4540 ../src/printing.c:373 +#: ../src/interface.c:4592 ../src/printing.c:408 msgid "Use the basename of the printed file" msgstr "" -#: ../src/interface.c:4543 +#: ../src/interface.c:4595 msgid "Print only the basename (without the path) of the printed file" msgstr "" -#: ../src/interface.c:4549 ../src/printing.c:381 +#: ../src/interface.c:4601 ../src/printing.c:416 #, fuzzy msgid "Date format:" msgstr "自定日期格式" -#: ../src/interface.c:4556 ../src/printing.c:387 +#: ../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 "" -#: ../src/interface.c:4559 +#: ../src/interface.c:4611 msgid "Use native GTK printing" msgstr "" -#: ../src/interface.c:4565 +#: ../src/interface.c:4617 #, fuzzy msgid "Printing" msgstr "列印" -#: ../src/interface.c:4976 +#: ../src/interface.c:5040 #, fuzzy msgid "Project Properties" msgstr "屬性" -#: ../src/keybindings.c:196 ../src/plugins.c:1112 +#: ../src/keybindings.c:198 ../src/plugins.c:1099 #, fuzzy msgid "File" msgstr "檔案(_F)" -#: ../src/keybindings.c:199 +#: ../src/keybindings.c:201 msgid "New" msgstr "新增" -#: ../src/keybindings.c:201 +#: ../src/keybindings.c:203 msgid "Open" msgstr "開啟" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:206 #, fuzzy msgid "Open selected file" msgstr "開啟檔案" -#: ../src/keybindings.c:206 +#: ../src/keybindings.c:208 msgid "Save" msgstr "儲存" -#: ../src/keybindings.c:208 +#: ../src/keybindings.c:210 #, fuzzy msgid "Save as" msgstr "全部儲存" -#: ../src/keybindings.c:210 +#: ../src/keybindings.c:212 msgid "Save all" msgstr "全部儲存" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:215 msgid "Print" msgstr "列印" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:217 msgid "Close" msgstr "關閉" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:219 msgid "Close all" msgstr "全部關閉" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:222 msgid "Reload file" msgstr "重新載入檔案" -#: ../src/keybindings.c:222 ../src/project.c:491 +#: ../src/keybindings.c:224 ../src/project.c:495 #, fuzzy msgid "Project" msgstr "建立物件(_o)" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:227 #, fuzzy msgid "Project properties" msgstr "屬性" -#: ../src/keybindings.c:230 +#: ../src/keybindings.c:232 msgid "Undo" msgstr "復原" -#: ../src/keybindings.c:232 +#: ../src/keybindings.c:234 msgid "Redo" msgstr "取消復原" -#: ../src/keybindings.c:234 +#: ../src/keybindings.c:236 msgid "Duplicate line or selection" msgstr "複製行或選擇區域" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:239 #, fuzzy msgid "Delete current line(s)" msgstr "關閉目前檔案" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:242 +#, fuzzy +msgid "Delete to line end" +msgstr "關閉目前檔案" + +#: ../src/keybindings.c:244 #, fuzzy msgid "Transpose current line" msgstr "列印目前的檔案" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:246 #, fuzzy msgid "Scroll to current line" msgstr "編譯目前檔案" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:248 #, fuzzy msgid "Scroll up the view by one line" msgstr "編譯目前檔案" -#: ../src/keybindings.c:245 +#: ../src/keybindings.c:250 msgid "Scroll down the view by one line" msgstr "" -#: ../src/keybindings.c:248 +#: ../src/keybindings.c:253 #, fuzzy msgid "Complete snippet" msgstr "自動補完文字" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:255 msgid "Move cursor in snippet" msgstr "" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:257 #, fuzzy msgid "Suppress snippet completion" msgstr "XML標籤自動補完" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:259 #, fuzzy msgid "Context Action" msgstr "在選擇區域中(_l)" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:261 msgid "Complete word" msgstr "自動補完文字" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:263 msgid "Show calltip" msgstr "" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:265 msgid "Show macro list" msgstr "顯示巨集清單" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:267 msgid "Clipboard" msgstr "" -#: ../src/keybindings.c:265 +#: ../src/keybindings.c:270 msgid "Cut" msgstr "" -#: ../src/keybindings.c:267 +#: ../src/keybindings.c:272 #, fuzzy msgid "Copy" msgstr "公司" -#: ../src/keybindings.c:269 +#: ../src/keybindings.c:274 msgid "Paste" msgstr "" -#: ../src/keybindings.c:271 +#: ../src/keybindings.c:276 #, fuzzy msgid "Copy current line(s)" msgstr "編譯目前檔案" -#: ../src/keybindings.c:273 +#: ../src/keybindings.c:278 #, fuzzy msgid "Cut current line(s)" msgstr "關閉目前檔案" -#: ../src/keybindings.c:275 +#: ../src/keybindings.c:280 #, fuzzy msgid "Select" msgstr "全部選取" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:283 msgid "Select All" msgstr "全部選取" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:285 #, fuzzy msgid "Select current word" msgstr "儲存目前檔案" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:287 #, fuzzy msgid "Select current line(s)" msgstr "儲存目前檔案" -#: ../src/keybindings.c:284 +#: ../src/keybindings.c:289 #, fuzzy msgid "Select current paragraph" msgstr "儲存目前檔案" -#: ../src/keybindings.c:286 +#: ../src/keybindings.c:291 #, fuzzy msgid "Format" msgstr "格式(_F)" -#: ../src/keybindings.c:290 +#: ../src/keybindings.c:295 #, fuzzy msgid "Toggle Case of Selection" msgstr "註釋/取消註釋行" -#: ../src/keybindings.c:292 +#: ../src/keybindings.c:297 msgid "Toggle line commentation" msgstr "註釋/取消註釋行" -#: ../src/keybindings.c:295 +#: ../src/keybindings.c:300 #, fuzzy msgid "Comment line(s)" msgstr "將此行註解" -#: ../src/keybindings.c:297 +#: ../src/keybindings.c:302 #, fuzzy msgid "Uncomment line(s)" msgstr "將此行反註解" -#: ../src/keybindings.c:299 +#: ../src/keybindings.c:304 msgid "Increase indent" msgstr "增加縮排" -#: ../src/keybindings.c:302 +#: ../src/keybindings.c:307 msgid "Decrease indent" msgstr "減少縮排" -#: ../src/keybindings.c:305 +#: ../src/keybindings.c:310 #, fuzzy msgid "Increase indent by one space" msgstr "增加縮排" -#: ../src/keybindings.c:307 +#: ../src/keybindings.c:312 #, fuzzy msgid "Decrease indent by one space" msgstr "減少縮排" -#: ../src/keybindings.c:309 +#: ../src/keybindings.c:314 msgid "Smart line indent" msgstr "" -#: ../src/keybindings.c:311 +#: ../src/keybindings.c:316 #, fuzzy msgid "Send to Custom Command 1" msgstr "設定自定義日期格式" -#: ../src/keybindings.c:313 +#: ../src/keybindings.c:318 #, fuzzy msgid "Send to Custom Command 2" msgstr "設定自定義日期格式" -#: ../src/keybindings.c:315 +#: ../src/keybindings.c:320 #, fuzzy msgid "Send to Custom Command 3" msgstr "設定自定義日期格式" -#: ../src/keybindings.c:317 +#: ../src/keybindings.c:322 #, fuzzy msgid "Send Selection to Terminal" msgstr "在選擇區域中(_l)" -#: ../src/keybindings.c:319 +#: ../src/keybindings.c:324 +msgid "Reflow lines/block" +msgstr "" + +#: ../src/keybindings.c:326 #, fuzzy msgid "Insert" msgstr "插入日期/時間" -#: ../src/keybindings.c:322 +#: ../src/keybindings.c:329 msgid "Insert date" msgstr "插入日期/時間" -#: ../src/keybindings.c:325 +#: ../src/keybindings.c:332 msgid "Insert alternative white space" msgstr "" -#: ../src/keybindings.c:327 +#: ../src/keybindings.c:334 #, fuzzy msgid "Settings" msgstr "區塊" -#: ../src/keybindings.c:333 ../src/toolbar.c:200 +#: ../src/keybindings.c:340 ../src/toolbar.c:350 #, fuzzy msgid "Search" msgstr "搜尋(_S)" -#: ../src/keybindings.c:336 ../src/search.c:364 +#: ../src/keybindings.c:343 ../src/search.c:379 msgid "Find" msgstr "尋找" -#: ../src/keybindings.c:338 +#: ../src/keybindings.c:345 msgid "Find Next" msgstr "尋找下一個" -#: ../src/keybindings.c:340 +#: ../src/keybindings.c:347 msgid "Find Previous" msgstr "尋找上一個" -#: ../src/keybindings.c:343 +#: ../src/keybindings.c:350 #, fuzzy msgid "Find Next Selection" msgstr "在選擇區域中(_l)" -#: ../src/keybindings.c:345 +#: ../src/keybindings.c:352 #, fuzzy msgid "Find Previous Selection" msgstr "尋找上一個" -#: ../src/keybindings.c:347 ../src/search.c:499 +#: ../src/keybindings.c:354 ../src/search.c:514 msgid "Replace" msgstr "取代" -#: ../src/keybindings.c:349 ../src/search.c:671 +#: ../src/keybindings.c:356 ../src/search.c:686 #, fuzzy msgid "Find in Files" msgstr "在一系列檔案中尋找(_i)" -#: ../src/keybindings.c:352 +#: ../src/keybindings.c:359 #, fuzzy msgid "Next Message" msgstr "訊息" -#: ../src/keybindings.c:354 +#: ../src/keybindings.c:361 #, fuzzy msgid "Previous Message" msgstr "訊息" -#: ../src/keybindings.c:356 +#: ../src/keybindings.c:363 msgid "Find Usage" msgstr "尋找用法" -#: ../src/keybindings.c:358 +#: ../src/keybindings.c:365 #, fuzzy msgid "Find Document Usage" msgstr "尋找用法" -#: ../src/keybindings.c:360 +#: ../src/keybindings.c:367 +#, fuzzy +msgid "Mark All" +msgstr "建立全部" + +#: ../src/keybindings.c:369 #, fuzzy msgid "Go to" msgstr "前往行數" -#: ../src/keybindings.c:363 ../src/toolbar.c:62 +#: ../src/keybindings.c:372 ../src/toolbar.c:66 msgid "Navigate back a location" msgstr "" -#: ../src/keybindings.c:365 ../src/toolbar.c:63 +#: ../src/keybindings.c:374 ../src/toolbar.c:67 msgid "Navigate forward a location" msgstr "" -#: ../src/keybindings.c:370 +#: ../src/keybindings.c:379 #, fuzzy msgid "Go to matching brace" msgstr "跳至對應括號" -#: ../src/keybindings.c:373 +#: ../src/keybindings.c:382 #, fuzzy msgid "Toggle marker" msgstr "開啟側邊欄" -#: ../src/keybindings.c:376 +#: ../src/keybindings.c:385 #, fuzzy msgid "Go to next marker" msgstr "開啟側邊欄" -#: ../src/keybindings.c:379 +#: ../src/keybindings.c:388 msgid "Go to previous marker" msgstr "" -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:390 msgid "Go to Tag Definition" msgstr "" -#: ../src/keybindings.c:383 +#: ../src/keybindings.c:392 msgid "Go to Tag Declaration" msgstr "" -#: ../src/keybindings.c:385 +#: ../src/keybindings.c:394 #, fuzzy msgid "Go to Start of Line" msgstr "前往行數" -#: ../src/keybindings.c:387 +#: ../src/keybindings.c:396 #, fuzzy msgid "Go to End of Line" msgstr "前往行數" -#: ../src/keybindings.c:389 +#: ../src/keybindings.c:398 +#, fuzzy +msgid "Go to End of Display Line" +msgstr "前往行數" + +#: ../src/keybindings.c:400 msgid "Go to Previous Word Part" msgstr "" -#: ../src/keybindings.c:391 +#: ../src/keybindings.c:402 #, fuzzy msgid "Go to Next Word Part" msgstr "開啟側邊欄" -#: ../src/keybindings.c:393 +#: ../src/keybindings.c:404 #, fuzzy msgid "View" msgstr "檢視(_V)" -#: ../src/keybindings.c:396 +#: ../src/keybindings.c:407 msgid "Toggle All Additional Widgets" msgstr "" -#: ../src/keybindings.c:399 +#: ../src/keybindings.c:410 msgid "Fullscreen" msgstr "全螢幕" -#: ../src/keybindings.c:401 +#: ../src/keybindings.c:412 msgid "Toggle Messages Window" msgstr "開啟訊息視窗" -#: ../src/keybindings.c:404 +#: ../src/keybindings.c:415 msgid "Toggle Sidebar" msgstr "開啟側邊欄" -#: ../src/keybindings.c:406 +#: ../src/keybindings.c:417 msgid "Zoom In" msgstr "拉近" -#: ../src/keybindings.c:408 +#: ../src/keybindings.c:419 msgid "Zoom Out" msgstr "拉遠" -#: ../src/keybindings.c:410 +#: ../src/keybindings.c:421 #, fuzzy msgid "Focus" msgstr "文件(_D)" -#: ../src/keybindings.c:413 +#: ../src/keybindings.c:424 msgid "Switch to Editor" msgstr "切換至編輯器" -#: ../src/keybindings.c:415 +#: ../src/keybindings.c:426 msgid "Switch to Scribble" msgstr "" -#: ../src/keybindings.c:417 +#: ../src/keybindings.c:428 msgid "Switch to VTE" msgstr "" -#: ../src/keybindings.c:419 +#: ../src/keybindings.c:430 #, fuzzy msgid "Switch to Search Bar" msgstr "切換至編輯器" -#: ../src/keybindings.c:421 +#: ../src/keybindings.c:432 #, fuzzy msgid "Switch to Sidebar" msgstr "切換至編輯器" -#: ../src/keybindings.c:423 +#: ../src/keybindings.c:434 #, fuzzy msgid "Switch to Compiler" msgstr "切換至編輯器" -#: ../src/keybindings.c:425 +#: ../src/keybindings.c:436 #, fuzzy msgid "Notebook tab" msgstr "指令" -#: ../src/keybindings.c:428 +#: ../src/keybindings.c:439 msgid "Switch to left document" msgstr "切換到左邊文件" -#: ../src/keybindings.c:430 +#: ../src/keybindings.c:441 msgid "Switch to right document" msgstr "切換到右邊文件" -#: ../src/keybindings.c:432 +#: ../src/keybindings.c:443 #, fuzzy msgid "Switch to last used document" msgstr "切換到左邊文件" -#: ../src/keybindings.c:434 +#: ../src/keybindings.c:445 #, fuzzy msgid "Move document left" msgstr "整個文件" -#: ../src/keybindings.c:436 +#: ../src/keybindings.c:447 #, fuzzy msgid "Move document right" msgstr "整個文件" -#: ../src/keybindings.c:438 +#: ../src/keybindings.c:449 #, fuzzy msgid "Move document first" msgstr "整個文件" -#: ../src/keybindings.c:440 +#: ../src/keybindings.c:451 #, fuzzy msgid "Move document last" msgstr "整個文件" -#: ../src/keybindings.c:442 +#: ../src/keybindings.c:453 #, fuzzy msgid "Document" msgstr "文件(_D)" -#: ../src/keybindings.c:445 +#: ../src/keybindings.c:456 #, fuzzy msgid "Toggle Line wrapping" msgstr "換行" -#: ../src/keybindings.c:447 +#: ../src/keybindings.c:458 #, fuzzy msgid "Toggle Line breaking" msgstr "切換行註譯狀態(_T)" -#: ../src/keybindings.c:451 +#: ../src/keybindings.c:462 #, fuzzy msgid "Replace spaces by tabs" msgstr "置換tab字元為空白(_R)" -#: ../src/keybindings.c:453 +#: ../src/keybindings.c:464 #, fuzzy msgid "Toggle current fold" msgstr "儲存目前檔案" -#: ../src/keybindings.c:455 +#: ../src/keybindings.c:466 msgid "Fold all" msgstr "全部折疊" -#: ../src/keybindings.c:457 +#: ../src/keybindings.c:468 msgid "Unfold all" msgstr "全部展開" -#: ../src/keybindings.c:459 +#: ../src/keybindings.c:470 msgid "Reload symbol list" msgstr "重新載入符號表" -#: ../src/keybindings.c:461 ../src/keybindings.c:466 ../src/ui_utils.c:1757 +#: ../src/keybindings.c:472 ../src/keybindings.c:477 ../src/ui_utils.c:1787 msgid "Build" msgstr "建構" -#: ../src/keybindings.c:464 ../src/toolbar.c:64 +#: ../src/keybindings.c:475 ../src/toolbar.c:68 msgid "Compile" msgstr "編譯" -#: ../src/keybindings.c:468 +#: ../src/keybindings.c:479 msgid "Make all" msgstr "建立全部" -#: ../src/keybindings.c:471 +#: ../src/keybindings.c:482 msgid "Make custom target" msgstr "" -#: ../src/keybindings.c:473 +#: ../src/keybindings.c:484 msgid "Make object" msgstr "建立物件" -#: ../src/keybindings.c:475 +#: ../src/keybindings.c:486 msgid "Next error" msgstr "" -#: ../src/keybindings.c:477 +#: ../src/keybindings.c:488 #, fuzzy msgid "Previous error" msgstr "翻譯者" -#: ../src/keybindings.c:479 +#: ../src/keybindings.c:490 msgid "Run" msgstr "執行" -#: ../src/keybindings.c:481 +#: ../src/keybindings.c:492 msgid "Run (alternative command)" msgstr "執行(替代的指令)" -#: ../src/keybindings.c:483 +#: ../src/keybindings.c:494 msgid "Build options" msgstr "建構選項" -#: ../src/keybindings.c:488 +#: ../src/keybindings.c:499 #, fuzzy msgid "Show Color Chooser" msgstr "顯示顏色選擇器" -#: ../src/keybindings.c:490 ../src/keybindings.c:493 +#: ../src/keybindings.c:501 ../src/keybindings.c:504 #, fuzzy msgid "Help" msgstr "說明(_H)" -#: ../src/keybindings.c:787 +#: ../src/keybindings.c:799 #, fuzzy msgid "Keyboard Shortcuts" msgstr "快速捷徑鍵(_K)" -#: ../src/keybindings.c:800 +#: ../src/keybindings.c:812 msgid "The following keyboard shortcuts are configurable:" msgstr "" -#: ../src/keybindings.c:1530 +#: ../src/keybindings.c:1583 #, fuzzy msgid "Switch to Document" msgstr "切換到左邊文件" -#: ../src/keyfile.c:801 +#: ../src/keyfile.c:811 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" -#: ../src/keyfile.c:1001 +#: ../src/keyfile.c:1015 #, fuzzy msgid "Failed to load one or more session files." msgstr "不要載入前一作業階段的檔案" -#: ../src/log.c:177 +#: ../src/log.c:181 #, fuzzy msgid "Debug Messages" msgstr "訊息" @@ -3288,7 +3327,7 @@ msgstr "" #: ../src/main.c:141 -msgid "don't load the previous session's files" +msgid "Don't load the previous session's files" msgstr "不要載入前一作業階段的檔案" #: ../src/main.c:143 @@ -3306,24 +3345,24 @@ msgid "Show version and exit" msgstr "顯示版本號並離開" -#: ../src/main.c:509 +#: ../src/main.c:470 msgid "[FILES...]" msgstr "" -#: ../src/main.c:526 +#: ../src/main.c:487 #, 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:631 +#: ../src/main.c:592 msgid "Move it now?" msgstr "" -#: ../src/main.c:633 +#: ../src/main.c:594 msgid "Geany needs to move your old configuration directory before starting." msgstr "" -#: ../src/main.c:639 +#: ../src/main.c:603 #, c-format msgid "" "Your configuration directory has been successfully moved from \"%s\" to \"%s" @@ -3332,14 +3371,14 @@ #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:649 +#: ../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 "" -#: ../src/main.c:730 +#: ../src/main.c:694 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3350,22 +3389,22 @@ "如果沒有組態文件目錄Geany可能會發生問題.\n" "即使這樣仍然要啟動Geany嗎?" -#: ../src/main.c:816 ../src/socket.c:164 +#: ../src/main.c:780 ../src/socket.c:164 #, fuzzy, c-format msgid "Could not find file '%s'." msgstr "無法開啟檔案%s(%s)" -#: ../src/main.c:1037 +#: ../src/main.c:990 #, c-format msgid "This is Geany %s." msgstr "這是Geany %s." -#: ../src/main.c:1039 +#: ../src/main.c:992 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../src/main.c:1275 +#: ../src/main.c:1224 #, fuzzy msgid "Configuration files reloaded." msgstr "編譯失敗." @@ -3384,18 +3423,18 @@ msgid "_Hide Message Window" msgstr "訊息視窗" -#: ../src/plugins.c:442 +#: ../src/plugins.c:425 #, c-format msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -#: ../src/plugins.c:882 +#: ../src/plugins.c:869 msgid "_Plugin Manager" msgstr "" -#: ../src/plugins.c:1030 +#: ../src/plugins.c:1017 #, c-format msgid "" "Plugin: %s %s\n" @@ -3403,78 +3442,88 @@ "Author(s): %s" msgstr "" -#: ../src/plugins.c:1100 +#: ../src/plugins.c:1087 #, fuzzy msgid "Active" msgstr "動作" -#: ../src/plugins.c:1106 +#: ../src/plugins.c:1093 msgid "Plugin" msgstr "" -#: ../src/plugins.c:1130 +#: ../src/plugins.c:1117 msgid "No plugins available." msgstr "" -#: ../src/plugins.c:1243 +#: ../src/plugins.c:1230 msgid "Plugins" msgstr "" -#: ../src/plugins.c:1263 +#: ../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:1276 +#: ../src/plugins.c:1263 #, fuzzy msgid "Plugin details:" msgstr "位置:" -#: ../src/prefs.c:144 -msgid "Action" -msgstr "動作" - -#: ../src/prefs.c:149 -msgid "Shortcut" -msgstr "捷徑" - -#: ../src/prefs.c:1139 +#: ../src/prefs.c:160 msgid "Grab Key" msgstr "" -#: ../src/prefs.c:1145 +#: ../src/prefs.c:166 #, c-format msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "" -#: ../src/prefs.c:1333 +#: ../src/prefs.c:209 ../src/symbols.c:1848 +#, fuzzy +msgid "_Expand All" +msgstr "全部搜尋" + +#: ../src/prefs.c:214 ../src/symbols.c:1853 +#, fuzzy +msgid "_Collapse All" +msgstr "全部關閉(_l)" + +#: ../src/prefs.c:273 +msgid "Action" +msgstr "動作" + +#: ../src/prefs.c:278 +msgid "Shortcut" +msgstr "捷徑" + +#: ../src/prefs.c:1398 msgid "_Override" msgstr "" -#: ../src/prefs.c:1334 +#: ../src/prefs.c:1399 msgid "Override that keybinding?" msgstr "" -#: ../src/prefs.c:1335 +#: ../src/prefs.c:1400 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "" #. add manually GeanyWrapLabels because they can't be added with Glade #. page Tools -#: ../src/prefs.c:1449 +#: ../src/prefs.c:1514 msgid "Enter tool paths below. Tools you do not need can be left blank." msgstr "" #. page Templates -#: ../src/prefs.c:1454 +#: ../src/prefs.c:1519 msgid "" "Set the information to be used in templates. See the documentation for " "details." msgstr "" -#: ../src/prefs.c:1458 +#: ../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." @@ -3482,7 +3531,7 @@ msgstr "" #. page Keybindings -#: ../src/prefs.c:1464 +#: ../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 " @@ -3490,65 +3539,66 @@ msgstr "" #. page Printing -#: ../src/prefs.c:1469 +#: ../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 "" -#. page Toolbar -#: ../src/prefs.c:1475 -msgid "" -"Notice: To customize the toolbar elements, edit the file 'ui_toolbar." -"xml'. Please see the documentation for details." -msgstr "" - #. page Editor->Indentation -#: ../src/prefs.c:1481 +#: ../src/prefs.c:1540 msgid "" "Warning: these settings are overridden by the current project. See " "Project->Properties." msgstr "" -#: ../src/printing.c:270 +#: ../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 #, fuzzy, c-format msgid "Page %d of %d" msgstr "變更:" -#: ../src/printing.c:340 +#: ../src/printing.c:375 #, fuzzy msgid "Document Setup" msgstr "位置:" -#: ../src/printing.c:375 +#: ../src/printing.c:410 msgid "Print only the basename(without the path) of the printed file" msgstr "" -#: ../src/printing.c:491 +#: ../src/printing.c:526 #, fuzzy, c-format msgid "Page %d of %d" msgstr "變更:" -#: ../src/printing.c:741 +#: ../src/printing.c:776 #, fuzzy, c-format msgid "Printing of file %s was cancelled." msgstr "行程(%s)失敗" -#: ../src/printing.c:743 ../src/printing.c:862 +#: ../src/printing.c:778 ../src/printing.c:897 #, fuzzy, c-format msgid "File %s printed." msgstr "檔案%s已儲存." -#: ../src/printing.c:792 +#: ../src/printing.c:827 #, fuzzy, c-format msgid "Printing of %s failed (%s)." msgstr "行程(%s)失敗" -#: ../src/printing.c:832 +#: ../src/printing.c:867 msgid "Please set a print command in the preferences dialog first." msgstr "" -#: ../src/printing.c:840 +#: ../src/printing.c:875 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3556,7 +3606,7 @@ "%s" msgstr "" -#: ../src/printing.c:856 +#: ../src/printing.c:891 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "" @@ -3576,586 +3626,595 @@ msgid "C_reate" msgstr "" -#: ../src/project.c:140 ../src/project.c:382 +#: ../src/project.c:140 ../src/project.c:386 msgid "Name:" msgstr "" -#: ../src/project.c:149 ../src/project.c:395 +#: ../src/project.c:149 ../src/project.c:399 #, fuzzy msgid "Filename:" msgstr "越南文" -#: ../src/project.c:165 ../src/project.c:425 +#: ../src/project.c:165 ../src/project.c:429 msgid "Base path:" msgstr "" -#: ../src/project.c:171 ../src/project.c:434 +#: ../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:437 +#: ../src/project.c:174 ../src/project.c:441 msgid "Choose Project Base Path" msgstr "" -#: ../src/project.c:235 ../src/project.c:266 ../src/project.c:913 +#: ../src/project.c:239 ../src/project.c:270 ../src/project.c:917 #, fuzzy, c-format msgid "Project file \"%s\" could not be loaded." msgstr "無法建立組態文件目錄(%s)." -#: ../src/project.c:260 ../src/project.c:272 +#: ../src/project.c:264 ../src/project.c:276 #, fuzzy msgid "Open Project" msgstr "建立物件" -#: ../src/project.c:292 +#: ../src/project.c:296 #, fuzzy msgid "Project files" msgstr "屬性" -#: ../src/project.c:326 +#: ../src/project.c:330 #, c-format msgid "Project \"%s\" closed." msgstr "" -#: ../src/project.c:408 +#: ../src/project.c:412 #, fuzzy msgid "Description:" msgstr "區塊" -#: ../src/project.c:443 +#: ../src/project.c:447 msgid "Make in base path" msgstr "" -#: ../src/project.c:448 +#: ../src/project.c:452 #, fuzzy msgid "Run command:" msgstr "指令" -#: ../src/project.c:457 +#: ../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:472 +#: ../src/project.c:476 #, fuzzy msgid "File patterns:" msgstr "中東語系(_M)" -#: ../src/project.c:574 +#: ../src/project.c:578 #, fuzzy msgid "Do you want to close it before proceeding?" msgstr "離開前您要存檔嗎?" -#: ../src/project.c:575 +#: ../src/project.c:579 #, c-format msgid "The '%s' project is already open." msgstr "" -#: ../src/project.c:619 +#: ../src/project.c:623 msgid "The specified project name is too short." msgstr "" -#: ../src/project.c:625 +#: ../src/project.c:629 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "" -#: ../src/project.c:633 +#: ../src/project.c:637 msgid "You have specified an invalid project filename." msgstr "" -#: ../src/project.c:656 +#: ../src/project.c:660 msgid "Create the project's base path directory?" msgstr "" -#: ../src/project.c:657 +#: ../src/project.c:661 #, c-format msgid "The path \"%s\" does not exist." msgstr "" -#: ../src/project.c:666 +#: ../src/project.c:670 #, fuzzy, c-format msgid "Project base directory could not be created (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../src/project.c:678 +#: ../src/project.c:682 #, fuzzy, c-format msgid "Project file could not be written (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../src/project.c:726 +#: ../src/project.c:730 #, c-format msgid "Project \"%s\" created." msgstr "" -#: ../src/project.c:728 +#: ../src/project.c:732 #, fuzzy, c-format msgid "Project \"%s\" saved." msgstr "檔案%s已儲存." #. initialise the dialog -#: ../src/project.c:794 ../src/project.c:805 +#: ../src/project.c:798 ../src/project.c:809 #, fuzzy msgid "Choose Project Filename" msgstr "屬性" #. initialise the dialog -#: ../src/project.c:823 ../src/project.c:834 +#: ../src/project.c:827 ../src/project.c:838 msgid "Choose Project Run Command" msgstr "" -#: ../src/project.c:903 +#: ../src/project.c:907 #, c-format msgid "Project \"%s\" opened." msgstr "" -#: ../src/search.c:201 +#: ../src/search.c:216 msgid "_Use regular expressions" msgstr "使用正規式(_U)" -#: ../src/search.c:205 +#: ../src/search.c:220 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "使用類POSIX正規式. 使用正規式的詳細資訊請參考文件." -#: ../src/search.c:212 +#: ../src/search.c:227 #, fuzzy msgid "Search _backwards" msgstr "尋找倒退字元(_S)" -#: ../src/search.c:226 +#: ../src/search.c:241 msgid "Use _escape sequences" msgstr "使用反斜線跳脫字元" -#: ../src/search.c:231 +#: ../src/search.c:246 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters" msgstr "" -#: ../src/search.c:240 ../src/search.c:766 +#: ../src/search.c:255 ../src/search.c:781 #, fuzzy msgid "C_ase sensitive" msgstr "區分大小寫(_C)" -#: ../src/search.c:245 ../src/search.c:772 +#: ../src/search.c:260 ../src/search.c:787 msgid "Match only a _whole word" msgstr "只符合整個字詞(_w)" -#: ../src/search.c:250 +#: ../src/search.c:265 #, fuzzy msgid "Match from s_tart of word" msgstr "只符合整個字詞(_w)" -#: ../src/search.c:371 +#: ../src/search.c:386 #, fuzzy msgid "_Previous" msgstr "找上一個(_P)" -#: ../src/search.c:377 +#: ../src/search.c:392 #, fuzzy msgid "_Next" msgstr "找下一個(_N)" -#: ../src/search.c:381 ../src/search.c:520 ../src/search.c:696 +#: ../src/search.c:396 ../src/search.c:535 ../src/search.c:711 #, fuzzy msgid "_Search for:" msgstr "搜尋:" #. Now add the multiple match options -#: ../src/search.c:409 +#: ../src/search.c:424 #, fuzzy msgid "_Find All" msgstr "全部搜尋" -#: ../src/search.c:416 +#: ../src/search.c:431 msgid "_Mark" msgstr "標記(_M)" -#: ../src/search.c:418 +#: ../src/search.c:433 msgid "Mark all matches in the current document" msgstr "" -#: ../src/search.c:423 ../src/search.c:580 +#: ../src/search.c:438 ../src/search.c:595 msgid "In Sessi_on" msgstr "在作業階段中(_o)" -#: ../src/search.c:428 ../src/search.c:585 +#: ../src/search.c:443 ../src/search.c:600 #, fuzzy msgid "_In Document" msgstr "文件(_D)" #. close window checkbox -#: ../src/search.c:434 ../src/search.c:598 +#: ../src/search.c:449 ../src/search.c:613 msgid "Close _dialog" msgstr "關閉對話方塊(_d)" -#: ../src/search.c:439 ../src/search.c:603 +#: ../src/search.c:454 ../src/search.c:618 msgid "Disable this option to keep the dialog open" msgstr "" -#: ../src/search.c:514 +#: ../src/search.c:529 #, fuzzy msgid "Replace & Fi_nd" msgstr "取代並尋找(_p)" -#: ../src/search.c:523 +#: ../src/search.c:538 #, fuzzy msgid "Replace wit_h:" msgstr "取代為:" #. Now add the multiple replace options -#: ../src/search.c:573 +#: ../src/search.c:588 #, fuzzy msgid "Re_place All" msgstr "全部取代" -#: ../src/search.c:590 +#: ../src/search.c:605 msgid "In Se_lection" msgstr "在選擇區域中(_l)" -#: ../src/search.c:592 +#: ../src/search.c:607 msgid "Replace all matches found in the currently selected text" msgstr "" -#: ../src/search.c:681 +#: ../src/search.c:696 #, fuzzy msgid "_Directory:" msgstr "目錄:" -#: ../src/search.c:712 +#: ../src/search.c:727 #, fuzzy msgid "E_ncoding:" msgstr "設定字元編碼:" -#: ../src/search.c:737 +#: ../src/search.c:752 #, fuzzy msgid "Fixed s_trings" msgstr "固定字串(_F)" -#: ../src/search.c:746 +#: ../src/search.c:761 msgid "_Grep regular expressions" msgstr "" -#: ../src/search.c:749 ../src/search.c:757 +#: ../src/search.c:764 ../src/search.c:772 msgid "See grep's manual page for more information" msgstr "" -#: ../src/search.c:754 +#: ../src/search.c:769 msgid "_Extended regular expressions" msgstr "擴展正規式" -#: ../src/search.c:761 +#: ../src/search.c:776 msgid "_Recurse in subfolders" msgstr "" -#: ../src/search.c:777 +#: ../src/search.c:792 msgid "_Invert search results" msgstr "" -#: ../src/search.c:782 +#: ../src/search.c:797 msgid "Invert the sense of matching, to select non-matching lines" msgstr "" -#: ../src/search.c:799 +#: ../src/search.c:814 msgid "E_xtra options:" msgstr "" -#: ../src/search.c:807 +#: ../src/search.c:822 msgid "Other options to pass to Grep" msgstr "" -#: ../src/search.c:1068 ../src/search.c:1675 ../src/search.c:1678 +#: ../src/search.c:1087 ../src/search.c:1694 ../src/search.c:1697 #, 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:1184 +#: ../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:1285 +#: ../src/search.c:1304 msgid "Invalid directory for find in files." msgstr "在檔案中尋找的目錄不合法." -#: ../src/search.c:1305 +#: ../src/search.c:1324 msgid "No text to find." msgstr "找不到文字." -#: ../src/search.c:1332 +#: ../src/search.c:1351 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "" -#: ../src/search.c:1400 +#: ../src/search.c:1419 #, fuzzy msgid "Searching..." msgstr "搜尋(_S)" -#: ../src/search.c:1412 +#: ../src/search.c:1431 #, fuzzy, c-format msgid "%s %s -- %s (in directory: %s)" msgstr "%s(在目錄: %s)" -#: ../src/search.c:1440 +#: ../src/search.c:1459 #, c-format msgid "Could not open directory (%s)" msgstr "無法開啟目錄(%s)" -#: ../src/search.c:1546 +#: ../src/search.c:1565 msgid "Search failed (see Help->Debug Messages for details)." msgstr "" -#: ../src/search.c:1567 +#: ../src/search.c:1586 #, fuzzy, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "搜尋結束." msgstr[1] "搜尋結束." -#: ../src/search.c:1575 +#: ../src/search.c:1594 msgid "No matches found." msgstr "找不到符合的內容." -#: ../src/symbols.c:580 ../src/symbols.c:621 ../src/symbols.c:684 +#: ../src/symbols.c:596 ../src/symbols.c:637 ../src/symbols.c:700 msgid "Chapter" msgstr "章節" -#: ../src/symbols.c:581 ../src/symbols.c:617 ../src/symbols.c:685 +#: ../src/symbols.c:597 ../src/symbols.c:633 ../src/symbols.c:701 msgid "Section" msgstr "區塊" -#: ../src/symbols.c:582 +#: ../src/symbols.c:598 msgid "Sect1" msgstr "" -#: ../src/symbols.c:583 +#: ../src/symbols.c:599 msgid "Sect2" msgstr "" -#: ../src/symbols.c:584 +#: ../src/symbols.c:600 msgid "Sect3" msgstr "" -#: ../src/symbols.c:585 +#: ../src/symbols.c:601 msgid "Appendix" msgstr "附錄" #. &(tv_iters.tag_macro), _("Macros"), #. &(tv_iters.tag_variable), _("Variables"), -#: ../src/symbols.c:586 ../src/symbols.c:622 ../src/symbols.c:743 -#: ../src/symbols.c:757 ../src/symbols.c:769 ../src/symbols.c:781 -#: ../src/symbols.c:796 ../src/symbols.c:841 +#: ../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:593 ../src/symbols.c:789 ../src/symbols.c:821 +#: ../src/symbols.c:609 ../src/symbols.c:815 ../src/symbols.c:847 msgid "Module" msgstr "模組" -#: ../src/symbols.c:594 ../src/symbols.c:767 ../src/symbols.c:779 -#: ../src/symbols.c:794 ../src/symbols.c:806 +#: ../src/symbols.c:610 ../src/symbols.c:793 ../src/symbols.c:805 +#: ../src/symbols.c:820 ../src/symbols.c:832 #, fuzzy msgid "Types" msgstr "型態" -#: ../src/symbols.c:595 +#: ../src/symbols.c:611 #, fuzzy msgid "Type constructors" msgstr "自動補完文字" -#: ../src/symbols.c:596 ../src/symbols.c:608 ../src/symbols.c:629 -#: ../src/symbols.c:638 ../src/symbols.c:653 ../src/symbols.c:665 -#: ../src/symbols.c:709 ../src/symbols.c:722 ../src/symbols.c:753 -#: ../src/symbols.c:776 ../src/symbols.c:791 ../src/symbols.c:828 +#: ../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:601 ../src/symbols.c:607 +#: ../src/symbols.c:617 ../src/symbols.c:623 #, fuzzy msgid "Sections" msgstr "區塊" -#: ../src/symbols.c:602 +#: ../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:609 ../src/symbols.c:655 ../src/symbols.c:710 -#: ../src/symbols.c:726 ../src/symbols.c:755 ../src/symbols.c:768 -#: ../src/symbols.c:777 ../src/symbols.c:793 ../src/symbols.c:840 +#: ../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:615 +#: ../src/symbols.c:631 msgid "Command" msgstr "指令" -#: ../src/symbols.c:616 +#: ../src/symbols.c:632 msgid "Environment" msgstr "系統環境" -#: ../src/symbols.c:618 ../src/symbols.c:686 +#: ../src/symbols.c:634 ../src/symbols.c:702 msgid "Subsection" msgstr "子區塊" -#: ../src/symbols.c:619 ../src/symbols.c:687 +#: ../src/symbols.c:635 ../src/symbols.c:703 msgid "Subsubsection" msgstr "子子區塊" -#: ../src/symbols.c:620 +#: ../src/symbols.c:636 msgid "Label" msgstr "標籤" -#: ../src/symbols.c:630 +#: ../src/symbols.c:646 #, fuzzy msgid "Structures" msgstr "狀態" -#: ../src/symbols.c:637 ../src/symbols.c:736 ../src/symbols.c:750 +#: ../src/symbols.c:653 ../src/symbols.c:762 ../src/symbols.c:776 msgid "Package" msgstr "套件" -#: ../src/symbols.c:639 +#: ../src/symbols.c:655 msgid "My" msgstr "我的" -#: ../src/symbols.c:640 +#: ../src/symbols.c:656 msgid "Local" msgstr "本地端" -#: ../src/symbols.c:641 +#: ../src/symbols.c:657 msgid "Our" msgstr "我們的" -#: ../src/symbols.c:651 ../src/symbols.c:737 ../src/symbols.c:751 -#: ../src/symbols.c:764 ../src/symbols.c:790 +#: ../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:652 ../src/symbols.c:676 ../src/symbols.c:695 -#: ../src/symbols.c:707 ../src/symbols.c:738 ../src/symbols.c:752 -#: ../src/symbols.c:765 ../src/symbols.c:827 +#: ../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:654 ../src/symbols.c:756 ../src/symbols.c:778 +#: ../src/symbols.c:670 ../src/symbols.c:782 ../src/symbols.c:804 msgid "Constants" msgstr "" -#: ../src/symbols.c:666 +#: ../src/symbols.c:682 msgid "Anchors" msgstr "" -#: ../src/symbols.c:667 +#: ../src/symbols.c:683 msgid "H1 Headings" msgstr "" -#: ../src/symbols.c:668 +#: ../src/symbols.c:684 msgid "H2 Headings" msgstr "" -#: ../src/symbols.c:669 +#: ../src/symbols.c:685 msgid "H3 Headings" msgstr "" -#: ../src/symbols.c:677 +#: ../src/symbols.c:693 #, fuzzy msgid "ID Selectors" msgstr "在選擇區域中(_l)" -#: ../src/symbols.c:678 +#: ../src/symbols.c:694 #, fuzzy msgid "Type Selectors" msgstr "自動補完文字" -#: ../src/symbols.c:694 +#: ../src/symbols.c:710 #, fuzzy msgid "Modules" msgstr "模組" -#: ../src/symbols.c:696 +#: ../src/symbols.c:712 msgid "Singletons" msgstr "" -#: ../src/symbols.c:697 ../src/symbols.c:708 ../src/symbols.c:739 -#: ../src/symbols.c:766 +#: ../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:740 ../src/symbols.c:829 +#: ../src/symbols.c:722 ../src/symbols.c:850 +msgid "Namespaces" +msgstr "命名空間" + +#: ../src/symbols.c:725 +#, fuzzy +msgid "Procedures" +msgstr "屬性" + +#: ../src/symbols.c:736 +msgid "Imports" +msgstr "" + +#: ../src/symbols.c:766 ../src/symbols.c:855 msgid "Members" msgstr "成員" -#: ../src/symbols.c:780 ../src/symbols.c:803 +#: ../src/symbols.c:806 ../src/symbols.c:829 #, fuzzy msgid "Labels" msgstr "標籤" -#: ../src/symbols.c:792 +#: ../src/symbols.c:818 msgid "Subroutines" msgstr "" -#: ../src/symbols.c:795 +#: ../src/symbols.c:821 msgid "Blocks" msgstr "" -#: ../src/symbols.c:804 ../src/symbols.c:813 ../src/symbols.c:837 +#: ../src/symbols.c:830 ../src/symbols.c:839 ../src/symbols.c:863 msgid "Macros" msgstr "巨集" -#: ../src/symbols.c:805 +#: ../src/symbols.c:831 #, fuzzy msgid "Defines" msgstr "行" -#: ../src/symbols.c:812 +#: ../src/symbols.c:838 msgid "Targets" msgstr "" -#: ../src/symbols.c:824 -msgid "Namespaces" -msgstr "命名空間" - -#: ../src/symbols.c:830 +#: ../src/symbols.c:856 #, fuzzy msgid "Structs" msgstr "狀態" -#: ../src/symbols.c:831 +#: ../src/symbols.c:857 msgid "Typedefs / Enums" msgstr "" -#: ../src/symbols.c:1307 +#: ../src/symbols.c:1337 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "" -#: ../src/symbols.c:1328 +#: ../src/symbols.c:1358 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "" -#: ../src/symbols.c:1335 +#: ../src/symbols.c:1365 #, c-format msgid "" "Usage: %s -g \n" "\n" msgstr "" -#: ../src/symbols.c:1336 +#: ../src/symbols.c:1366 #, c-format msgid "" "Example:\n" @@ -4163,181 +4222,189 @@ "gtk/gtk.h\n" msgstr "" -#: ../src/symbols.c:1350 +#: ../src/symbols.c:1380 msgid "Load Tags" msgstr "" -#: ../src/symbols.c:1357 +#: ../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:1377 +#: ../src/symbols.c:1407 #, fuzzy, c-format msgid "Loaded %s tags file '%s'." msgstr "無法開啟檔案%s(%s)" -#: ../src/symbols.c:1379 +#: ../src/symbols.c:1409 #, fuzzy, c-format msgid "Could not load tags file '%s'." msgstr "無法開啟檔案%s(%s)" -#: ../src/symbols.c:1513 +#: ../src/symbols.c:1555 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "" -#: ../src/symbols.c:1515 +#: ../src/symbols.c:1557 #, c-format msgid "Definition of \"%s\" not found." msgstr "" -#: ../src/symbols.c:1806 -#, fuzzy -msgid "_Expand All" -msgstr "全部搜尋" - -#: ../src/symbols.c:1811 -#, fuzzy -msgid "_Collapse All" -msgstr "全部關閉(_l)" - -#: ../src/symbols.c:1821 +#: ../src/symbols.c:1863 #, fuzzy msgid "Sort by _Name" msgstr "外觀" -#: ../src/symbols.c:1828 +#: ../src/symbols.c:1870 #, fuzzy msgid "Sort by _Appearance" msgstr "外觀" -#: ../src/toolbar.c:51 +#. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" +#: ../src/toolbar.c:55 msgid "Save the current file" msgstr "儲存目前檔案" -#: ../src/toolbar.c:52 ../src/ui_utils.c:1755 -#, fuzzy -msgid "Save All" -msgstr "全部儲存(_l)" - -#: ../src/toolbar.c:52 +#: ../src/toolbar.c:56 msgid "Save all open files" msgstr "儲存所有開啟的檔案" -#: ../src/toolbar.c:53 +#: ../src/toolbar.c:57 msgid "Reload the current file from disk" msgstr "從磁碟重新載入目前檔案" -#: ../src/toolbar.c:54 +#: ../src/toolbar.c:58 msgid "Close the current file" msgstr "關閉目前檔案" -#: ../src/toolbar.c:55 +#: ../src/toolbar.c:59 #, fuzzy msgid "Close all open files" msgstr "關閉所有開啟的檔案" -#: ../src/toolbar.c:56 +#: ../src/toolbar.c:60 #, fuzzy msgid "Cut the current selection" msgstr "轉換目前選擇區域的大/小寫" -#: ../src/toolbar.c:57 +#: ../src/toolbar.c:61 #, fuzzy msgid "Copy the current selection" msgstr "編譯目前檔案" -#: ../src/toolbar.c:58 +#: ../src/toolbar.c:62 msgid "Paste the contents of the clipboard" msgstr "" -#: ../src/toolbar.c:59 +#: ../src/toolbar.c:63 #, fuzzy msgid "Delete the current selection" msgstr "轉換目前選擇區域的大/小寫" -#: ../src/toolbar.c:60 +#: ../src/toolbar.c:64 msgid "Undo the last modification" msgstr "取消執行上次操作" -#: ../src/toolbar.c:61 +#: ../src/toolbar.c:65 msgid "Redo the last modification" msgstr "重新執行上次操作" -#: ../src/toolbar.c:64 +#: ../src/toolbar.c:68 msgid "Compile the current file" msgstr "編譯目前檔案" -#: ../src/toolbar.c:65 +#: ../src/toolbar.c:69 msgid "Run or view the current file" msgstr "" -#: ../src/toolbar.c:66 +#: ../src/toolbar.c:70 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette" msgstr "" -#: ../src/toolbar.c:67 +#: ../src/toolbar.c:71 msgid "Zoom in the text" msgstr "放大文字" -#: ../src/toolbar.c:68 +#: ../src/toolbar.c:72 msgid "Zoom out the text" msgstr "縮小文字" -#: ../src/toolbar.c:69 +#: ../src/toolbar.c:73 #, fuzzy msgid "Decrease indentation" msgstr "減少縮排" -#: ../src/toolbar.c:70 +#: ../src/toolbar.c:74 #, fuzzy msgid "Increase indentation" msgstr "增加縮排" -#: ../src/toolbar.c:71 ../src/toolbar.c:200 +#: ../src/toolbar.c:75 ../src/toolbar.c:350 msgid "Find the entered text in the current file" msgstr "在目前檔案中尋找輸入的文字" -#: ../src/toolbar.c:72 ../src/toolbar.c:208 +#: ../src/toolbar.c:76 ../src/toolbar.c:358 #, fuzzy msgid "Jump to the entered line number" msgstr "跳至指定行號" -#: ../src/toolbar.c:73 +#: ../src/toolbar.c:77 msgid "Show the preferences dialog" msgstr "" -#: ../src/toolbar.c:74 +#: ../src/toolbar.c:78 msgid "Quit Geany" msgstr "離開Geany" -#: ../src/toolbar.c:75 +#: ../src/toolbar.c:79 #, fuzzy msgid "Print document" msgstr "整個文件" -#: ../src/toolbar.c:153 -msgid "" -"For all changes you make in this file to take effect, you need to restart " -"Geany." -msgstr "" +#: ../src/toolbar.c:80 +#, fuzzy +msgid "Replace text in the current document" +msgstr "轉換目前選擇區域的大/小寫" #. Create our custom actions -#: ../src/toolbar.c:184 +#: ../src/toolbar.c:334 msgid "Create a new file" msgstr "建立新檔案" -#: ../src/toolbar.c:189 +#: ../src/toolbar.c:339 msgid "Open an existing file" msgstr "開啟舊檔" -#: ../src/toolbar.c:208 +#: ../src/toolbar.c:358 #, fuzzy 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 "顯示" + #: ../src/tools.c:153 #, c-format msgid "" @@ -4405,131 +4472,153 @@ msgid "Characters:" msgstr "章節" -#: ../src/treeviews.c:176 +#: ../src/treeviews.c:177 msgid "No tags found" msgstr "" -#: ../src/treeviews.c:490 +#: ../src/treeviews.c:508 #, fuzzy msgid "Show S_ymbol List" msgstr "顯示符號列表" -#: ../src/treeviews.c:498 +#: ../src/treeviews.c:516 #, fuzzy msgid "Show _Document List" msgstr "顯示開啟檔案列表" -#: ../src/treeviews.c:506 ../plugins/filebrowser.c:583 +#: ../src/treeviews.c:524 ../plugins/filebrowser.c:580 #, fuzzy msgid "H_ide Sidebar" msgstr "隱藏側面欄" +#: ../src/treeviews.c:591 +#, fuzzy +msgid "Show _Paths" +msgstr "顯示工具列" + #. Status bar statistics: col = column, sel = selection. -#: ../src/ui_utils.c:194 +#: ../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:200 +#: ../src/ui_utils.c:194 msgid "RO " msgstr "" #. OVR = overwrite/overtype, INS = insert -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "OVR" msgstr "覆寫" -#: ../src/ui_utils.c:202 +#: ../src/ui_utils.c:196 msgid "INS" msgstr "插入" -#: ../src/ui_utils.c:208 +#: ../src/ui_utils.c:202 msgid "TAB" msgstr "" -#: ../src/ui_utils.c:211 +#: ../src/ui_utils.c:205 msgid "SP" msgstr "" -#: ../src/ui_utils.c:214 +#: ../src/ui_utils.c:208 msgid "T/S" msgstr "" -#: ../src/ui_utils.c:218 +#: ../src/ui_utils.c:212 #, c-format msgid "mode: %s" msgstr "" -#: ../src/ui_utils.c:221 +#: ../src/ui_utils.c:215 #, fuzzy, c-format msgid "encoding: %s %s" msgstr "設定字元編碼:" -#: ../src/ui_utils.c:227 +#: ../src/ui_utils.c:221 #, c-format msgid "filetype: %s" msgstr "" -#: ../src/ui_utils.c:231 +#: ../src/ui_utils.c:225 msgid "MOD" msgstr "" -#: ../src/ui_utils.c:236 +#: ../src/ui_utils.c:230 #, c-format msgid "scope: %s" msgstr "" -#: ../src/ui_utils.c:321 +#: ../src/ui_utils.c:315 #, c-format msgid "Font updated (%s)." msgstr "" -#: ../src/ui_utils.c:517 +#: ../src/ui_utils.c:511 msgid "C Standard Library" msgstr "C標準函式庫" -#: ../src/ui_utils.c:518 +#: ../src/ui_utils.c:512 msgid "ISO C99" msgstr "" -#: ../src/ui_utils.c:519 +#: ../src/ui_utils.c:513 msgid "C++ (C Standard Library)" msgstr "C++(C標準函式庫)" -#: ../src/ui_utils.c:520 +#: ../src/ui_utils.c:514 msgid "C++ Standard Library" msgstr "標準 C++ 函式庫" -#: ../src/ui_utils.c:521 +#: ../src/ui_utils.c:515 msgid "C++ STL" msgstr "" -#: ../src/ui_utils.c:585 +#: ../src/ui_utils.c:579 #, fuzzy msgid "_Set Custom Date Format" msgstr "設定自定義日期格式" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 #, fuzzy msgid "Select Folder" msgstr "選擇資料夾" -#: ../src/ui_utils.c:1618 +#: ../src/ui_utils.c:1644 #, fuzzy msgid "Select File" msgstr "全部選取" -#: ../src/ui_utils.c:1737 +#: ../src/ui_utils.c:1767 #, fuzzy msgid "C_onfiguration Files" msgstr "編譯失敗." -#: ../src/ui_utils.c:1756 +#: ../src/ui_utils.c:1785 +#, fuzzy +msgid "Save All" +msgstr "全部儲存(_l)" + +#: ../src/ui_utils.c:1786 #, fuzzy msgid "Close All" msgstr "全部關閉(_l)" +#: ../src/utils.c:324 +msgid "Win (CRLF)" +msgstr "" + +#: ../src/utils.c:325 +msgid "Mac (CR)" +msgstr "" + +#: ../src/utils.c:326 +msgid "Unix (LF)" +msgstr "" + #: ../src/vte.c:301 ../src/vte.c:726 msgid "Terminal" msgstr "終端機" @@ -4688,344 +4777,328 @@ "note, programs executed in VTE cannot be stopped" msgstr "" -#: ../src/win32.c:131 +#: ../src/win32.c:135 #, fuzzy msgid "Geany project files" msgstr "屬性" -#: ../src/win32.c:137 +#: ../src/win32.c:141 msgid "Executables" msgstr "" -#: ../src/win32.c:575 -msgid "Error" -msgstr "錯誤" - -#: ../src/win32.c:581 ../src/win32.c:640 -msgid "Question" -msgstr "問題" - -#: ../src/win32.c:587 -msgid "Warning" -msgstr "警告" - -#: ../src/win32.c:593 -msgid "Information" -msgstr "資訊" - -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 #, fuzzy msgid "Class Builder" msgstr "類別" -#: ../plugins/classbuilder.c:44 +#: ../plugins/classbuilder.c:37 msgid "Creates source files for new class types." msgstr "" -#: ../plugins/classbuilder.c:329 +#: ../plugins/classbuilder.c:322 msgid "Create Class" msgstr "" -#: ../plugins/classbuilder.c:339 +#: ../plugins/classbuilder.c:332 #, fuzzy msgid "Class" msgstr "類別" -#: ../plugins/classbuilder.c:348 +#: ../plugins/classbuilder.c:341 #, fuzzy msgid "Class name:" msgstr "類別" -#: ../plugins/classbuilder.c:359 +#: ../plugins/classbuilder.c:352 #, fuzzy msgid "Header file:" msgstr "重新載入檔案" -#: ../plugins/classbuilder.c:368 +#: ../plugins/classbuilder.c:361 #, fuzzy msgid "Source file:" msgstr "C 原始檔" -#: ../plugins/classbuilder.c:374 +#: ../plugins/classbuilder.c:367 #, fuzzy msgid "Inheritance" msgstr "介面" -#: ../plugins/classbuilder.c:383 +#: ../plugins/classbuilder.c:376 msgid "Base class:" msgstr "" -#: ../plugins/classbuilder.c:396 +#: ../plugins/classbuilder.c:389 msgid "Base header:" msgstr "" -#: ../plugins/classbuilder.c:404 +#: ../plugins/classbuilder.c:397 msgid "Global" msgstr "" -#: ../plugins/classbuilder.c:413 +#: ../plugins/classbuilder.c:406 #, fuzzy msgid "Base GType:" msgstr "型態" -#: ../plugins/classbuilder.c:421 +#: ../plugins/classbuilder.c:414 #, fuzzy msgid "Options" msgstr "函式" -#: ../plugins/classbuilder.c:430 +#: ../plugins/classbuilder.c:423 #, fuzzy msgid "Create constructor" msgstr "自動補完文字" -#: ../plugins/classbuilder.c:434 +#: ../plugins/classbuilder.c:427 #, fuzzy msgid "Create destructor" msgstr "自動補完文字" -#: ../plugins/classbuilder.c:444 +#: ../plugins/classbuilder.c:437 msgid "GTK+ constructor type" msgstr "" -#: ../plugins/classbuilder.c:751 +#: ../plugins/classbuilder.c:744 msgid "Create Cla_ss" msgstr "" -#: ../plugins/classbuilder.c:757 +#: ../plugins/classbuilder.c:750 #, fuzzy msgid "_C++ Class" msgstr "類別" -#: ../plugins/classbuilder.c:760 +#: ../plugins/classbuilder.c:753 #, fuzzy msgid "_GTK+ Class" msgstr "類別" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 #, fuzzy msgid "HTML Characters" msgstr "章節" -#: ../plugins/htmlchars.c:47 +#: ../plugins/htmlchars.c:38 msgid "Inserts HTML character entities like '&'." msgstr "" -#: ../plugins/htmlchars.c:48 ../plugins/export.c:46 -#: ../plugins/filebrowser.c:51 ../plugins/saveactions.c:48 -#: ../plugins/splitwindow.c:43 +#: ../plugins/htmlchars.c:39 ../plugins/export.c:38 +#: ../plugins/filebrowser.c:41 ../plugins/saveactions.c:40 +#: ../plugins/splitwindow.c:37 #, fuzzy msgid "The Geany developer team" msgstr "開發者名字" -#: ../plugins/htmlchars.c:81 +#: ../plugins/htmlchars.c:72 msgid "HTML characters" msgstr "" -#: ../plugins/htmlchars.c:87 +#: ../plugins/htmlchars.c:78 msgid "ISO 8859-1 characters" msgstr "" -#: ../plugins/htmlchars.c:185 +#: ../plugins/htmlchars.c:176 msgid "Greek characters" msgstr "" -#: ../plugins/htmlchars.c:240 +#: ../plugins/htmlchars.c:231 msgid "Mathematical characters" msgstr "" -#: ../plugins/htmlchars.c:281 +#: ../plugins/htmlchars.c:272 msgid "Technical characters" msgstr "" -#: ../plugins/htmlchars.c:289 +#: ../plugins/htmlchars.c:280 msgid "Arrow characters" msgstr "" -#: ../plugins/htmlchars.c:302 +#: ../plugins/htmlchars.c:293 msgid "Punctuation characters" msgstr "" -#: ../plugins/htmlchars.c:318 +#: ../plugins/htmlchars.c:309 msgid "Miscellaneous characters" msgstr "" -#: ../plugins/htmlchars.c:456 +#: ../plugins/htmlchars.c:447 #, fuzzy msgid "Special Characters" msgstr "章節" -#: ../plugins/htmlchars.c:458 +#: ../plugins/htmlchars.c:449 #, fuzzy msgid "_Insert" msgstr "插入日期/時間" -#: ../plugins/htmlchars.c:467 +#: ../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:481 +#: ../plugins/htmlchars.c:472 #, fuzzy msgid "Character" msgstr "章節" -#: ../plugins/htmlchars.c:487 +#: ../plugins/htmlchars.c:478 msgid "HTML (name)" msgstr "" -#: ../plugins/htmlchars.c:687 +#: ../plugins/htmlchars.c:678 msgid "_Insert Special HTML Characters" msgstr "" #. Add menuitem for html replacement functions -#: ../plugins/htmlchars.c:699 +#: ../plugins/htmlchars.c:690 #, fuzzy msgid "HTML Replacement" msgstr "取代" -#: ../plugins/htmlchars.c:706 +#: ../plugins/htmlchars.c:697 msgid "_HTMLToggle" msgstr "" -#: ../plugins/htmlchars.c:715 +#: ../plugins/htmlchars.c:706 msgid "Bulk replacement of special chars" msgstr "" -#: ../plugins/htmlchars.c:730 +#: ../plugins/htmlchars.c:721 msgid "Insert Special HTML Characters" msgstr "" -#: ../plugins/htmlchars.c:733 +#: ../plugins/htmlchars.c:724 #, fuzzy msgid "Replace special characters" msgstr "章節" -#: ../plugins/htmlchars.c:736 +#: ../plugins/htmlchars.c:727 #, fuzzy msgid "Toggle plugin status" msgstr "註釋/取消註釋行" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 msgid "Export" msgstr "" -#: ../plugins/export.c:45 +#: ../plugins/export.c:37 #, fuzzy msgid "Exports the current file into different formats." msgstr "編譯目前檔案為DVI檔案" -#: ../plugins/export.c:174 +#: ../plugins/export.c:166 #, fuzzy msgid "Export File" msgstr "開啟檔案" -#: ../plugins/export.c:191 +#: ../plugins/export.c:183 msgid "_Use current zoom level" msgstr "" -#: ../plugins/export.c:193 +#: ../plugins/export.c:185 msgid "" "Renders the font size of the document together with the current zoom level" msgstr "" -#: ../plugins/export.c:275 +#: ../plugins/export.c:267 #, c-format msgid "Document successfully exported as '%s'." msgstr "" -#: ../plugins/export.c:277 +#: ../plugins/export.c:269 #, fuzzy, c-format msgid "File '%s' could not be written (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../plugins/export.c:324 +#: ../plugins/export.c:316 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "檔案 '%s' 已存在.是否真要覆寫?" -#: ../plugins/export.c:711 +#: ../plugins/export.c:703 msgid "_Export" msgstr "" #. HTML -#: ../plugins/export.c:718 +#: ../plugins/export.c:710 msgid "As _HTML" msgstr "" #. LaTeX -#: ../plugins/export.c:724 +#: ../plugins/export.c:716 msgid "As _LaTeX" msgstr "" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 #, fuzzy msgid "File Browser" msgstr "瀏覽器" -#: ../plugins/filebrowser.c:50 +#: ../plugins/filebrowser.c:40 msgid "Adds a file browser tab to the sidebar." msgstr "" -#: ../plugins/filebrowser.c:326 +#: ../plugins/filebrowser.c:323 msgid "Too many items selected!" msgstr "" -#: ../plugins/filebrowser.c:402 +#: ../plugins/filebrowser.c:399 #, c-format msgid "Could not execute configured external command '%s' (%s)." msgstr "" -#: ../plugins/filebrowser.c:558 +#: ../plugins/filebrowser.c:555 msgid "Open _externally" msgstr "" -#: ../plugins/filebrowser.c:564 +#: ../plugins/filebrowser.c:561 #, fuzzy msgid "_Find in Files" msgstr "在一系列檔案中尋找(_i)" -#: ../plugins/filebrowser.c:574 +#: ../plugins/filebrowser.c:571 #, fuzzy msgid "Show _Hidden Files" msgstr "顯示隱藏檔案" -#: ../plugins/filebrowser.c:766 +#: ../plugins/filebrowser.c:763 msgid "Up" msgstr "" -#: ../plugins/filebrowser.c:771 +#: ../plugins/filebrowser.c:768 msgid "Refresh" msgstr "" -#: ../plugins/filebrowser.c:776 +#: ../plugins/filebrowser.c:773 msgid "Home" msgstr "" -#: ../plugins/filebrowser.c:781 +#: ../plugins/filebrowser.c:778 #, fuzzy msgid "Set path from document" msgstr "切換到左邊文件" -#: ../plugins/filebrowser.c:789 +#: ../plugins/filebrowser.c:786 #, fuzzy msgid "Clear the filter" msgstr "關閉目前檔案" -#: ../plugins/filebrowser.c:803 +#: ../plugins/filebrowser.c:800 #, fuzzy msgid "Filter:" msgstr "檔案(_F)" -#: ../plugins/filebrowser.c:1022 +#: ../plugins/filebrowser.c:1019 msgid "Focus File List" msgstr "" -#: ../plugins/filebrowser.c:1024 +#: ../plugins/filebrowser.c:1021 msgid "Focus Path Entry" msgstr "" -#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:478 +#: ../plugins/filebrowser.c:1067 ../plugins/saveactions.c:470 #, fuzzy msgid "Plugin configuration directory could not be created." msgstr "無法建立組態文件目錄(%s)." @@ -5062,7 +5135,7 @@ msgstr "" #: ../plugins/filebrowser.c:1128 -msgid "Set the project's base directory" +msgid "Use the project's base directory" msgstr "" #: ../plugins/filebrowser.c:1132 @@ -5071,32 +5144,32 @@ "Change the directory to the base directory of the currently opened project" msgstr "儲存目前檔案" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 #, fuzzy msgid "Save Actions" msgstr "區塊" -#: ../plugins/saveactions.c:47 +#: ../plugins/saveactions.c:39 msgid "This plugin provides different actions related to saving of files." msgstr "" -#: ../plugins/saveactions.c:177 +#: ../plugins/saveactions.c:169 #, fuzzy, c-format msgid "Backup Copy: Directory could not be created (%s)." msgstr "無法建立組態文件目錄(%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:209 +#: ../plugins/saveactions.c:201 #, fuzzy, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../plugins/saveactions.c:227 +#: ../plugins/saveactions.c:219 #, fuzzy, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "無法建立組態文件目錄(%s)." -#: ../plugins/saveactions.c:319 +#: ../plugins/saveactions.c:311 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5104,109 +5177,124 @@ msgstr[1] "" #. initialize the dialog -#: ../plugins/saveactions.c:388 +#: ../plugins/saveactions.c:380 #, fuzzy msgid "Select Directory" msgstr "儲存目前檔案" -#: ../plugins/saveactions.c:471 +#: ../plugins/saveactions.c:463 msgid "Backup directory does not exist or is not writable." msgstr "" -#: ../plugins/saveactions.c:551 +#: ../plugins/saveactions.c:543 #, fuzzy msgid "Auto Save" msgstr "儲存" -#: ../plugins/saveactions.c:553 ../plugins/saveactions.c:616 -#: ../plugins/saveactions.c:655 +#: ../plugins/saveactions.c:545 ../plugins/saveactions.c:607 +#: ../plugins/saveactions.c:648 msgid "_Enable" msgstr "" -#: ../plugins/saveactions.c:561 +#: ../plugins/saveactions.c:553 msgid "Auto save _interval:" msgstr "" -#: ../plugins/saveactions.c:569 +#: ../plugins/saveactions.c:561 #, fuzzy msgid "seconds" msgstr "指令" -#: ../plugins/saveactions.c:578 +#: ../plugins/saveactions.c:570 msgid "_Print status message if files have been automatically saved" msgstr "" -#: ../plugins/saveactions.c:586 +#: ../plugins/saveactions.c:578 #, fuzzy msgid "Save only current open _file" msgstr "儲存目前檔案" -#: ../plugins/saveactions.c:593 +#: ../plugins/saveactions.c:585 #, fuzzy msgid "Sa_ve all open files" msgstr "儲存所有開啟的檔案" -#: ../plugins/saveactions.c:614 +#: ../plugins/saveactions.c:605 #, fuzzy msgid "Instant Save" msgstr "插入日期/時間" -#: ../plugins/saveactions.c:624 +#: ../plugins/saveactions.c:615 msgid "_Filetype to use for newly opened files:" msgstr "" -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:646 msgid "Backup Copy" msgstr "" -#: ../plugins/saveactions.c:663 +#: ../plugins/saveactions.c:656 msgid "_Directory to save backup files in:" msgstr "" -#: ../plugins/saveactions.c:686 +#: ../plugins/saveactions.c:679 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "" -#: ../plugins/saveactions.c:699 +#: ../plugins/saveactions.c:692 msgid "Directory _levels to include in the backup destination:" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Split Window" msgstr "" -#: ../plugins/splitwindow.c:42 +#: ../plugins/splitwindow.c:36 msgid "Splits the editor view into two windows." msgstr "" -#: ../plugins/splitwindow.c:285 ../plugins/splitwindow.c:412 +#: ../plugins/splitwindow.c:277 +#, fuzzy +msgid "Show the current document" +msgstr "切換到左邊文件" + +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:417 msgid "_Unsplit" msgstr "" -#: ../plugins/splitwindow.c:394 +#: ../plugins/splitwindow.c:399 msgid "_Split Window" msgstr "" -#: ../plugins/splitwindow.c:402 +#: ../plugins/splitwindow.c:407 msgid "_Horizontally" msgstr "" -#: ../plugins/splitwindow.c:407 +#: ../plugins/splitwindow.c:412 msgid "_Vertically" msgstr "" -#: ../plugins/splitwindow.c:422 +#: ../plugins/splitwindow.c:427 msgid "Split Horizontally" msgstr "" -#: ../plugins/splitwindow.c:424 +#: ../plugins/splitwindow.c:429 msgid "Split Vertically" msgstr "" -#: ../plugins/splitwindow.c:426 +#: ../plugins/splitwindow.c:431 msgid "Unsplit" msgstr "" +#~ msgid "Diff file" +#~ msgstr "差異檔" + +#~ msgid "Select _All" +#~ msgstr "全選(_A)" + +#, fuzzy +#~ msgid "Automatic symbol completion" +#~ msgstr "XML標籤自動補完" + #~ msgid "Jump to the entered line number." #~ msgstr "跳至指定行號" @@ -5510,10 +5598,6 @@ #~ msgstr "顯示開啟檔案列表" #, fuzzy -#~ msgid "Construct autocompletion" -#~ msgstr "XML標籤自動補完" - -#, fuzzy #~ msgid "Symbol autocompletion" #~ msgstr "XML標籤自動補完" @@ -5532,10 +5616,6 @@ #~ msgstr "自動補完文字" #, fuzzy -#~ msgid "Suppress construct completion" -#~ msgstr "XML標籤自動補完" - -#, fuzzy #~ msgid "Hide" #~ msgstr "隱藏" diff -Nru /tmp/H5qKeNSrz8/geany-0.17/README.Packagers /tmp/ssBwSf4GIv/geany-0.18/README.Packagers --- geany-0.17/README.Packagers 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.18/README.Packagers 2009-06-18 15:20:07.000000000 +0100 @@ -26,8 +26,9 @@ manual. What you shouldn't skip in your package: the filetype.* files in the data/ subdirectory, these files are important. If they are missing, -Geany has still a fallback mechanism for syntax highlighting but several -other features for certain filetypes will fail (mainly build support). +Geany still has a fallback mechanism for syntax highlighting (if +filetypes.common is installed) but several other features for certain +filetypes will fail (mainly build support). Testing your package diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/CellBuffer.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/CellBuffer.cxx --- geany-0.17/scintilla/CellBuffer.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/CellBuffer.cxx 2009-07-04 10:19:36.000000000 +0100 @@ -21,165 +21,23 @@ using namespace Scintilla; #endif -MarkerHandleSet::MarkerHandleSet() { - root = 0; -} - -MarkerHandleSet::~MarkerHandleSet() { - MarkerHandleNumber *mhn = root; - while (mhn) { - MarkerHandleNumber *mhnToFree = mhn; - mhn = mhn->next; - delete mhnToFree; - } - root = 0; -} - -int MarkerHandleSet::Length() const { - int c = 0; - MarkerHandleNumber *mhn = root; - while (mhn) { - c++; - mhn = mhn->next; - } - return c; -} - -int MarkerHandleSet::NumberFromHandle(int handle) const { - MarkerHandleNumber *mhn = root; - while (mhn) { - if (mhn->handle == handle) { - return mhn->number; - } - mhn = mhn->next; - } - return - 1; -} - -int MarkerHandleSet::MarkValue() const { - unsigned int m = 0; - MarkerHandleNumber *mhn = root; - while (mhn) { - m |= (1 << mhn->number); - mhn = mhn->next; - } - return m; -} - -bool MarkerHandleSet::Contains(int handle) const { - MarkerHandleNumber *mhn = root; - while (mhn) { - if (mhn->handle == handle) { - return true; - } - mhn = mhn->next; - } - return false; -} - -bool MarkerHandleSet::InsertHandle(int handle, int markerNum) { - MarkerHandleNumber *mhn = new MarkerHandleNumber; - if (!mhn) - return false; - mhn->handle = handle; - mhn->number = markerNum; - mhn->next = root; - root = mhn; - return true; -} - -void MarkerHandleSet::RemoveHandle(int handle) { - MarkerHandleNumber **pmhn = &root; - while (*pmhn) { - MarkerHandleNumber *mhn = *pmhn; - if (mhn->handle == handle) { - *pmhn = mhn->next; - delete mhn; - return; - } - pmhn = &((*pmhn)->next); - } -} - -bool MarkerHandleSet::RemoveNumber(int markerNum) { - bool performedDeletion = false; - MarkerHandleNumber **pmhn = &root; - while (*pmhn) { - MarkerHandleNumber *mhn = *pmhn; - if (mhn->number == markerNum) { - *pmhn = mhn->next; - delete mhn; - performedDeletion = true; - } else { - pmhn = &((*pmhn)->next); - } - } - return performedDeletion; -} - -void MarkerHandleSet::CombineWith(MarkerHandleSet *other) { - MarkerHandleNumber **pmhn = &root; - while (*pmhn) { - pmhn = &((*pmhn)->next); - } - *pmhn = other->root; - other->root = 0; -} - -LineVector::LineVector() : starts(256) { - handleCurrent = 1; - +LineVector::LineVector() : starts(256), perLine(0) { Init(); } LineVector::~LineVector() { starts.DeleteAll(); - for (int line = 0; line < markers.Length(); line++) { - delete markers[line]; - markers[line] = 0; - } - markers.DeleteAll(); - levels.DeleteAll(); } void LineVector::Init() { starts.DeleteAll(); - for (int line = 0; line < markers.Length(); line++) { - delete markers[line]; - markers[line] = 0; + if (perLine) { + perLine->Init(); } - markers.DeleteAll(); - levels.DeleteAll(); } -void LineVector::ExpandLevels(int sizeNew) { - levels.InsertValue(levels.Length(), sizeNew - levels.Length(), SC_FOLDLEVELBASE); -} - -void LineVector::ClearLevels() { - levels.DeleteAll(); -} - -int LineVector::SetLevel(int line, int level) { - int prev = 0; - if ((line >= 0) && (line < Lines())) { - if (!levels.Length()) { - ExpandLevels(Lines() + 1); - } - prev = levels[line]; - if (prev != level) { - levels[line] = level; - } - } - return prev; -} - -int LineVector::GetLevel(int line) { - if (levels.Length() && (line >= 0) && (line < Lines())) { - return levels[line]; - } else { - return SC_FOLDLEVELBASE; - } +void LineVector::SetPerLine(PerLine *pl) { + perLine = pl; } void LineVector::InsertText(int line, int delta) { @@ -188,15 +46,8 @@ void LineVector::InsertLine(int line, int position) { starts.InsertPartition(line, position); - if (markers.Length()) { - markers.Insert(line, 0); - } - if (levels.Length()) { - int level = SC_FOLDLEVELBASE; - if ((line > 0) && (line < Lines())) { - level = levels[line-1] & ~SC_FOLDLEVELWHITEFLAG; - } - levels.InsertValue(line, 1, level); + if (perLine) { + perLine->InsertLine(line); } } @@ -206,103 +57,15 @@ void LineVector::RemoveLine(int line) { starts.RemovePartition(line); - // Retain the markers from the deleted line by oring them into the previous line - if (markers.Length()) { - if (line > 0) { - MergeMarkers(line - 1); - } - markers.Delete(line); - } - if (levels.Length()) { - // Move up following lines but merge header flag from this line - // to line before to avoid a temporary disappearence causing expansion. - int firstHeader = levels[line] & SC_FOLDLEVELHEADERFLAG; - levels.Delete(line); - if (line > 0) - levels[line-1] |= firstHeader; + if (perLine) { + perLine->RemoveLine(line); } } -int LineVector::LineFromPosition(int pos) { +int LineVector::LineFromPosition(int pos) const { return starts.PartitionFromPosition(pos); } -int LineVector::MarkValue(int line) { - if (markers.Length() && markers[line]) - return markers[line]->MarkValue(); - else - return 0; -} - -int LineVector::AddMark(int line, int markerNum) { - handleCurrent++; - if (!markers.Length()) { - // No existing markers so allocate one element per line - markers.InsertValue(0, Lines(), 0); - } - if (!markers[line]) { - // Need new structure to hold marker handle - markers[line] = new MarkerHandleSet(); - if (!markers[line]) - return - 1; - } - markers[line]->InsertHandle(handleCurrent, markerNum); - - return handleCurrent; -} - -void LineVector::MergeMarkers(int pos) { - if (markers[pos + 1] != NULL) { - if (markers[pos] == NULL) - markers[pos] = new MarkerHandleSet; - markers[pos]->CombineWith(markers[pos + 1]); - delete markers[pos + 1]; - markers[pos + 1] = NULL; - } -} - -void LineVector::DeleteMark(int line, int markerNum, bool all) { - if (markers.Length() && markers[line]) { - if (markerNum == -1) { - delete markers[line]; - markers[line] = NULL; - } else { - bool performedDeletion = markers[line]->RemoveNumber(markerNum); - while (all && performedDeletion) { - performedDeletion = markers[line]->RemoveNumber(markerNum); - } - if (markers[line]->Length() == 0) { - delete markers[line]; - markers[line] = NULL; - } - } - } -} - -void LineVector::DeleteMarkFromHandle(int markerHandle) { - int line = LineFromHandle(markerHandle); - if (line >= 0) { - markers[line]->RemoveHandle(markerHandle); - if (markers[line]->Length() == 0) { - delete markers[line]; - markers[line] = NULL; - } - } -} - -int LineVector::LineFromHandle(int markerHandle) { - if (markers.Length()) { - for (int line = 0; line < Lines(); line++) { - if (markers[line]) { - if (markers[line]->Contains(markerHandle)) { - return line; - } - } - } - } - return -1; -} - Action::Action() { at = startAction; position = 0; @@ -398,7 +161,7 @@ } void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData, - bool &startSequence) { + bool &startSequence, bool mayCoalesce) { EnsureUndoRoom(); //Platform::DebugPrintf("%% %d action %d %d %d\n", at, position, lengthData, currentAction); //Platform::DebugPrintf("^ %d action %d %d\n", actions[currentAction - 1].at, @@ -410,25 +173,35 @@ if (currentAction >= 1) { if (0 == undoSequenceDepth) { // Top level actions may not always be coalesced - Action &actPrevious = actions[currentAction - 1]; + int targetAct = -1; + const Action *actPrevious = &(actions[currentAction + targetAct]); + // Container actions may forward the coalesce state of Scintilla Actions. + while ((actPrevious->at == containerAction) && actPrevious->mayCoalesce) { + targetAct--; + actPrevious = &(actions[currentAction + targetAct]); + } // See if current action can be coalesced into previous action // Will work if both are inserts or deletes and position is same - if (at != actPrevious.at) { + if (currentAction == savePoint) { + currentAction++; + } else if (!actions[currentAction].mayCoalesce) { + // Not allowed to coalesce if this set currentAction++; - } else if (currentAction == savePoint) { + } else if (!mayCoalesce || !actPrevious->mayCoalesce) { + currentAction++; + } else if (at == containerAction || actions[currentAction].at == containerAction) { + ; // A coalescible containerAction + } else if ((at != actPrevious->at) && (actPrevious->at != startAction)) { currentAction++; } else if ((at == insertAction) && - (position != (actPrevious.position + actPrevious.lenData))) { + (position != (actPrevious->position + actPrevious->lenData))) { // Insertions must be immediately after to coalesce currentAction++; - } else if (!actions[currentAction].mayCoalesce) { - // Not allowed to coalesce if this set - currentAction++; } else if (at == removeAction) { if ((lengthData == 1) || (lengthData == 2)){ - if ((position + lengthData) == actPrevious.position) { + if ((position + lengthData) == actPrevious->position) { ; // Backspace -> OK - } else if (position == actPrevious.position) { + } else if (position == actPrevious->position) { ; // Delete -> OK } else { // Removals must be at same position to coalesce @@ -451,7 +224,7 @@ currentAction++; } startSequence = oldCurrentAction != currentAction; - actions[currentAction].Create(at, position, data, lengthData); + actions[currentAction].Create(at, position, data, lengthData, mayCoalesce); currentAction++; actions[currentAction].Create(startAction); maxAction = currentAction; @@ -666,6 +439,10 @@ style.ReAllocate(newSize); } +void CellBuffer::SetPerLine(PerLine *pl) { + lv.SetPerLine(pl); +} + int CellBuffer::Lines() const { return lv.Lines(); } @@ -695,54 +472,14 @@ return uh.IsSavePoint(); } -int CellBuffer::AddMark(int line, int markerNum) { - if ((line >= 0) && (line < Lines())) { - return lv.AddMark(line, markerNum); - } - return - 1; -} - -void CellBuffer::DeleteMark(int line, int markerNum) { - if ((line >= 0) && (line < Lines())) { - lv.DeleteMark(line, markerNum, false); - } -} - -void CellBuffer::DeleteMarkFromHandle(int markerHandle) { - lv.DeleteMarkFromHandle(markerHandle); -} - -int CellBuffer::GetMark(int line) { - if ((line >= 0) && (line < Lines())) - return lv.MarkValue(line); - return 0; -} - -void CellBuffer::DeleteAllMarks(int markerNum) { - for (int line = 0; line < Lines(); line++) { - lv.DeleteMark(line, markerNum, true); - } -} - -int CellBuffer::LineFromHandle(int markerHandle) { - return lv.LineFromHandle(markerHandle); -} - // Without undo void CellBuffer::InsertLine(int line, int position) { lv.InsertLine(line, position); - if (lineStates.Length()) { - lineStates.EnsureLength(line); - lineStates.Insert(line, 0); - } } void CellBuffer::RemoveLine(int line) { lv.RemoveLine(line); - if (lineStates.Length() > line) { - lineStates.Delete(line); - } } void CellBuffer::BasicInsertString(int position, const char *s, int insertLength) { @@ -862,6 +599,11 @@ uh.EndUndoAction(); } +void CellBuffer::AddUndoAction(int token, bool mayCoalesce) { + bool startSequence; + uh.AppendAction(containerAction, token, 0, 0, startSequence, mayCoalesce); +} + void CellBuffer::DeleteUndoHistory() { uh.DeleteUndoHistory(); } @@ -910,30 +652,3 @@ uh.CompletedRedoStep(); } -int CellBuffer::SetLineState(int line, int state) { - lineStates.EnsureLength(line + 1); - int stateOld = lineStates[line]; - lineStates[line] = state; - return stateOld; -} - -int CellBuffer::GetLineState(int line) { - lineStates.EnsureLength(line + 1); - return lineStates[line]; -} - -int CellBuffer::GetMaxLineState() { - return lineStates.Length(); -} - -int CellBuffer::SetLevel(int line, int level) { - return lv.SetLevel(line, level); -} - -int CellBuffer::GetLevel(int line) { - return lv.GetLevel(line); -} - -void CellBuffer::ClearLevels() { - lv.ClearLevels(); -} diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/CellBuffer.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/CellBuffer.h --- geany-0.17/scintilla/CellBuffer.h 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/CellBuffer.h 2009-07-04 10:19:36.000000000 +0100 @@ -12,33 +12,13 @@ namespace Scintilla { #endif -/** - * This holds the marker identifier and the marker type to display. - * MarkerHandleNumbers are members of lists. - */ -struct MarkerHandleNumber { - int handle; - int number; - MarkerHandleNumber *next; -}; - -/** - * A marker handle set contains any number of MarkerHandleNumbers. - */ -class MarkerHandleSet { - MarkerHandleNumber *root; - +// Interface to per-line data that wants to see each line insertion and deletion +class PerLine { public: - MarkerHandleSet(); - ~MarkerHandleSet(); - int Length() const; - int NumberFromHandle(int handle) const; - int MarkValue() const; ///< Bit set of marker numbers. - bool Contains(int handle) const; - bool InsertHandle(int handle, int markerNum); - void RemoveHandle(int handle); - bool RemoveNumber(int markerNum); - void CombineWith(MarkerHandleSet *other); + virtual ~PerLine() {} + virtual void Init()=0; + virtual void InsertLine(int)=0; + virtual void RemoveLine(int)=0; }; /** @@ -47,21 +27,14 @@ class LineVector { Partitioning starts; - SplitVector markers; - SplitVector levels; - /// Handles are allocated sequentially and should never have to be reused as 32 bit ints are very big. - int handleCurrent; + PerLine *perLine; public: LineVector(); ~LineVector(); void Init(); - - void ExpandLevels(int sizeNew=-1); - void ClearLevels(); - int SetLevel(int line, int level); - int GetLevel(int line); + void SetPerLine(PerLine *pl); void InsertText(int line, int delta); void InsertLine(int line, int position); @@ -70,7 +43,7 @@ int Lines() const { return starts.Partitions(); } - int LineFromPosition(int pos); + int LineFromPosition(int pos) const; int LineStart(int line) const { return starts.PositionFromPartition(line); } @@ -81,9 +54,18 @@ void DeleteMark(int line, int markerNum, bool all); void DeleteMarkFromHandle(int markerHandle); int LineFromHandle(int markerHandle); + + void ClearLevels(); + int SetLevel(int line, int level); + int GetLevel(int line); + + int SetLineState(int line, int state); + int GetLineState(int line); + int GetMaxLineState(); + }; -enum actionType { insertAction, removeAction, startAction }; +enum actionType { insertAction, removeAction, startAction, containerAction }; /** * Actions are used to store all the information required to perform one undo/redo step. @@ -120,7 +102,7 @@ UndoHistory(); ~UndoHistory(); - void AppendAction(actionType at, int position, char *data, int length, bool &startSequence); + void AppendAction(actionType at, int position, char *data, int length, bool &startSequence, bool mayCoalesce=true); void BeginUndoAction(); void EndUndoAction(); @@ -160,8 +142,6 @@ LineVector lv; - SplitVector lineStates; - public: CellBuffer(); @@ -175,9 +155,10 @@ int Length() const; void Allocate(int newSize); + void SetPerLine(PerLine *pl); int Lines() const; int LineStart(int line) const; - int LineFromPosition(int pos) { return lv.LineFromPosition(pos); } + int LineFromPosition(int pos) const { return lv.LineFromPosition(pos); } void InsertLine(int line, int position); void RemoveLine(int line); const char *InsertString(int position, const char *s, int insertLength, bool &startSequence); @@ -197,14 +178,6 @@ void SetSavePoint(); bool IsSavePoint(); - /// Line marker functions - int AddMark(int line, int markerNum); - void DeleteMark(int line, int markerNum); - void DeleteMarkFromHandle(int markerHandle); - int GetMark(int line); - void DeleteAllMarks(int markerNum); - int LineFromHandle(int markerHandle); - /// Actions without undo void BasicInsertString(int position, const char *s, int insertLength); void BasicDeleteChars(int position, int deleteLength); @@ -213,6 +186,7 @@ bool IsCollectingUndo(); void BeginUndoAction(); void EndUndoAction(); + void AddUndoAction(int token, bool mayCoalesce); void DeleteUndoHistory(); /// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is @@ -225,14 +199,6 @@ int StartRedo(); const Action &GetRedoStep() const; void PerformRedoStep(); - - int SetLineState(int line, int state); - int GetLineState(int line); - int GetMaxLineState(); - - int SetLevel(int line, int level); - int GetLevel(int line); - void ClearLevels(); }; #ifdef SCI_NAMESPACE diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/Document.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/Document.cxx --- geany-0.17/scintilla/Document.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/Document.cxx 2009-07-04 10:19:36.000000000 +0100 @@ -17,6 +17,7 @@ #include "Partitioning.h" #include "RunStyles.h" #include "CellBuffer.h" +#include "PerLine.h" #include "CharClassify.h" #include "Decoration.h" #include "Document.h" @@ -74,6 +75,14 @@ matchesValid = false; regex = 0; + + perLineData[ldMarkers] = new LineMarkers(); + perLineData[ldLevels] = new LineLevels(); + perLineData[ldState] = new LineState(); + perLineData[ldMargin] = new LineAnnotation(); + perLineData[ldAnnotation] = new LineAnnotation(); + + cb.SetPerLine(this); } Document::~Document() { @@ -81,12 +90,37 @@ watchers[i].watcher->NotifyDeleted(this, watchers[i].userData); } delete []watchers; + for (int j=0; jInit(); + } +} + +void Document::InsertLine(int line) { + for (int j=0; jInsertLine(line); + } +} + +void Document::RemoveLine(int line) { + for (int j=0; jRemoveLine(line); + } +} + // Increase reference count and return its previous value. int Document::AddRef() { return refCount++; @@ -106,42 +140,58 @@ NotifySavePoint(true); } +int Document::GetMark(int line) { + return static_cast(perLineData[ldMarkers])->MarkValue(line); +} + int Document::AddMark(int line, int markerNum) { - int prev = cb.AddMark(line, markerNum); - DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); - NotifyModified(mh); - return prev; + if (line <= LinesTotal()) { + int prev = static_cast(perLineData[ldMarkers])-> + AddMark(line, markerNum, LinesTotal()); + DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line); + NotifyModified(mh); + return prev; + } else { + return 0; + } } void Document::AddMarkSet(int line, int valueSet) { unsigned int m = valueSet; for (int i = 0; m; i++, m >>= 1) if (m & 1) - cb.AddMark(line, i); + 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) { - cb.DeleteMark(line, markerNum); + 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) { - cb.DeleteMarkFromHandle(markerHandle); + static_cast(perLineData[ldMarkers])->DeleteMarkFromHandle(markerHandle); DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0); mh.line = -1; NotifyModified(mh); } void Document::DeleteAllMarks(int markerNum) { - cb.DeleteAllMarks(markerNum); + for (int line = 0; line < LinesTotal(); line++) { + 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::LineStart(int line) const { return cb.LineStart(line); } @@ -159,15 +209,15 @@ } } -int Document::LineFromPosition(int pos) { +int Document::LineFromPosition(int pos) const { return cb.LineFromPosition(pos); } -int Document::LineEndPosition(int position) { +int Document::LineEndPosition(int position) const { return LineEnd(LineFromPosition(position)); } -int Document::VCHomePosition(int position) { +int Document::VCHomePosition(int position) const { int line = LineFromPosition(position); int startPosition = LineStart(line); int endLine = LineEnd(line); @@ -181,7 +231,7 @@ } int Document::SetLevel(int line, int level) { - int prev = cb.SetLevel(line, level); + 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); @@ -192,6 +242,14 @@ return prev; } +int Document::GetLevel(int line) { + return static_cast(perLineData[ldLevels])->GetLevel(line); +} + +void Document::ClearLevels() { + static_cast(perLineData[ldLevels])->ClearLevels(); +} + static bool IsSubordinate(int levelStart, int levelTry) { if (levelTry & SC_FOLDLEVELWHITEFLAG) return true; @@ -503,21 +561,27 @@ if (action.at == removeAction) { NotifyModified(DocModification( SC_MOD_BEFOREINSERT | SC_PERFORMED_UNDO, action)); + } else if (action.at == containerAction) { + DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_UNDO); + dm.token = action.position; + NotifyModified(dm); } else { NotifyModified(DocModification( SC_MOD_BEFOREDELETE | SC_PERFORMED_UNDO, action)); } cb.PerformUndoStep(); int cellPosition = action.position; - ModifiedAt(cellPosition); - newPos = cellPosition; + if (action.at != containerAction) { + ModifiedAt(cellPosition); + newPos = cellPosition; + } int modFlags = SC_PERFORMED_UNDO; // With undo, an insertion action becomes a deletion notification if (action.at == removeAction) { newPos += action.lenData; modFlags |= SC_MOD_INSERTTEXT; - } else { + } else if (action.at == insertAction) { modFlags |= SC_MOD_DELETETEXT; } if (steps > 1) @@ -558,19 +622,25 @@ if (action.at == insertAction) { NotifyModified(DocModification( SC_MOD_BEFOREINSERT | SC_PERFORMED_REDO, action)); + } else if (action.at == containerAction) { + DocModification dm(SC_MOD_CONTAINER | SC_PERFORMED_REDO); + dm.token = action.position; + NotifyModified(dm); } else { NotifyModified(DocModification( SC_MOD_BEFOREDELETE | SC_PERFORMED_REDO, action)); } cb.PerformRedoStep(); - ModifiedAt(action.position); - newPos = action.position; + if (action.at != containerAction) { + ModifiedAt(action.position); + newPos = action.position; + } int modFlags = SC_PERFORMED_REDO; if (action.at == insertAction) { newPos += action.lenData; modFlags |= SC_MOD_INSERTTEXT; - } else { + } else if (action.at == removeAction) { modFlags |= SC_MOD_DELETETEXT; } if (steps > 1) @@ -1059,8 +1129,8 @@ } if (found) { if ((!word && !wordStart) || - word && IsWordAt(pos, pos + lengthFind) || - wordStart && IsWordStartAt(pos)) + (word && IsWordAt(pos, pos + lengthFind)) || + (wordStart && IsWordStartAt(pos))) return pos; } } @@ -1075,8 +1145,8 @@ } if (found) { if ((!word && !wordStart) || - word && IsWordAt(pos, pos + lengthFind) || - wordStart && IsWordStartAt(pos)) + (word && IsWordAt(pos, pos + lengthFind)) || + (wordStart && IsWordStartAt(pos))) return pos; } } @@ -1155,7 +1225,7 @@ } } -bool Document::SetStyles(int length, char *styles) { +bool Document::SetStyles(int length, const char *styles) { if (enteredStyling != 0) { return false; } else { @@ -1194,7 +1264,7 @@ } int Document::SetLineState(int line, int state) { - int statePrevious = cb.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); @@ -1202,6 +1272,89 @@ return statePrevious; } +int Document::GetLineState(int line) { + return static_cast(perLineData[ldState])->GetLineState(line); +} + +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), + pla->MultipleStyles(line), pla->Style(line), pla->Styles(line)); +} + +void Document::MarginSetText(int line, const char *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); +} + +void Document::MarginSetStyles(int line, const unsigned char *styles) { + static_cast(perLineData[ldMargin])->SetStyles(line, styles); +} + +int Document::MarginLength(int line) const { + return static_cast(perLineData[ldMargin])->Length(line); +} + +void Document::MarginClearAll() { + int maxEditorLine = LinesTotal(); + for (int l=0;l(perLineData[ldMargin])->ClearAll(); +} + +bool Document::AnnotationAny() const { + 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), + 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); + const int linesAfter = AnnotationLines(line); + DocModification mh(SC_MOD_CHANGEANNOTATION, LineStart(line), 0, 0, 0, line); + mh.annotationLinesAdded = linesAfter - linesBefore; + NotifyModified(mh); +} + +void Document::AnnotationSetStyle(int line, int style) { + static_cast(perLineData[ldAnnotation])->SetStyle(line, style); +} + +void Document::AnnotationSetStyles(int line, const unsigned char *styles) { + static_cast(perLineData[ldAnnotation])->SetStyles(line, styles); +} + +int Document::AnnotationLength(int line) const { + return static_cast(perLineData[ldAnnotation])->Length(line); +} + +int Document::AnnotationLines(int line) const { + return static_cast(perLineData[ldAnnotation])->Lines(line); +} + +void Document::AnnotationClearAll() { + int maxEditorLine = LinesTotal(); + for (int l=0;l(perLineData[ldAnnotation])->ClearAll(); +} + void Document::IncrementStyleClock() { styleClock = (styleClock + 1) % 0x100000; } @@ -1657,8 +1810,18 @@ #ifndef SCI_OWNREGEX +#ifdef SCI_NAMESPACE + +RegexSearchBase *Scintilla::CreateRegexSearch(CharClassify *charClassTable) { + return new BuiltinRegex(charClassTable); +} + +#else + RegexSearchBase *CreateRegexSearch(CharClassify *charClassTable) { return new BuiltinRegex(charClassTable); } #endif + +#endif diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/Document.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/Document.h --- geany-0.17/scintilla/Document.h 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/Document.h 2009-07-04 10:19:36.000000000 +0100 @@ -93,9 +93,31 @@ /// Factory function for RegexSearchBase extern RegexSearchBase* CreateRegexSearch(CharClassify *charClassTable); +struct StyledText { + size_t length; + const char *text; + bool multipleStyles; + size_t 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. + // Return 1 when start is outside text + size_t LineLength(size_t start) const { + size_t cur = start; + while ((cur < length) && (text[cur] != '\n')) + cur++; + return cur-start; + } + size_t StyleAt(size_t i) const { + return multipleStyles ? styles[i] : style; + } +}; + /** */ -class Document { +class Document : PerLine { public: /** Used to pair watcher pointer with user data. */ @@ -110,7 +132,6 @@ }; enum charClassification { ccSpace, ccNewLine, ccWord, ccPunctuation }; - private: int refCount; CellBuffer cb; @@ -125,6 +146,10 @@ WatcherWithUserData *watchers; int lenWatchers; + // ldSize is not real data - it is for dimensions and loops + enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldSize }; + PerLine *perLineData[ldSize]; + bool matchesValid; RegexSearchBase* regex; @@ -150,7 +175,11 @@ int AddRef(); int Release(); - int LineFromPosition(int pos); + virtual void Init(); + virtual void InsertLine(int line); + virtual void RemoveLine(int line); + + int LineFromPosition(int pos) const; int ClampPositionIntoDocument(int pos); bool IsCrLf(int pos); int LenChar(int pos); @@ -173,6 +202,7 @@ bool IsCollectingUndo() { return cb.IsCollectingUndo(); } void BeginUndoAction() { cb.BeginUndoAction(); } void EndUndoAction() { cb.EndUndoAction(); } + void AddUndoAction(int token, bool mayCoalesce) { cb.AddUndoAction(token, mayCoalesce); } void SetSavePoint(); bool IsSavePoint() { return cb.IsSavePoint(); } const char *BufferPointer() { return cb.BufferPointer(); } @@ -199,21 +229,21 @@ cb.GetCharRange(buffer, position, lengthRetrieve); } char StyleAt(int position) { return cb.StyleAt(position); } - int GetMark(int line) { return cb.GetMark(line); } + int GetMark(int line); int AddMark(int line, int markerNum); void AddMarkSet(int line, int valueSet); void DeleteMark(int line, int markerNum); void DeleteMarkFromHandle(int markerHandle); void DeleteAllMarks(int markerNum); - int LineFromHandle(int markerHandle) { return cb.LineFromHandle(markerHandle); } + int LineFromHandle(int markerHandle); int LineStart(int line) const; int LineEnd(int line) const; - int LineEndPosition(int position); - int VCHomePosition(int position); + int LineEndPosition(int position) const; + int VCHomePosition(int position) const; int SetLevel(int line, int level); - int GetLevel(int line) { return cb.GetLevel(line); } - void ClearLevels() { cb.ClearLevels(); } + int GetLevel(int line); + void ClearLevels(); int GetLastChild(int lineParent, int level=-1); int GetFoldParent(int line); @@ -236,7 +266,7 @@ void SetStylingBits(int bits); void StartStyling(int position, char mask); bool SetStyleFor(int length, char style); - bool SetStyles(int length, char *styles); + bool SetStyles(int length, const char *styles); int GetEndStyled() { return endStyled; } void EnsureStyledTo(int pos); int GetStyleClock() { return styleClock; } @@ -244,8 +274,24 @@ void DecorationFillRange(int position, int value, int fillLength); int SetLineState(int line, int state); - int GetLineState(int line) { return cb.GetLineState(line); } - int GetMaxLineState() { return cb.GetMaxLineState(); } + int GetLineState(int line); + int GetMaxLineState(); + + StyledText MarginStyledText(int line); + void MarginSetStyle(int line, int style); + void MarginSetStyles(int line, const unsigned char *styles); + void MarginSetText(int line, const char *text); + int MarginLength(int line) const; + void MarginClearAll(); + + bool AnnotationAny() const; + StyledText AnnotationStyledText(int line); + void AnnotationSetText(int line, const char *text); + void AnnotationSetStyle(int line, int style); + void AnnotationSetStyles(int line, const unsigned char *styles); + int AnnotationLength(int line) const; + int AnnotationLines(int line) const; + void AnnotationClearAll(); bool AddWatcher(DocWatcher *watcher, void *userData); bool RemoveWatcher(DocWatcher *watcher, void *userData); @@ -288,6 +334,8 @@ int line; int foldLevelNow; int foldLevelPrev; + int annotationLinesAdded; + int token; DocModification(int modificationType_, int position_=0, int length_=0, int linesAdded_=0, const char *text_=0, int line_=0) : @@ -298,7 +346,9 @@ text(text_), line(line_), foldLevelNow(0), - foldLevelPrev(0) {} + foldLevelPrev(0), + annotationLinesAdded(0), + token(0) {} DocModification(int modificationType_, const Action &act, int linesAdded_=0) : modificationType(modificationType_), @@ -308,7 +358,9 @@ text(act.data), line(0), foldLevelNow(0), - foldLevelPrev(0) {} + foldLevelPrev(0), + annotationLinesAdded(0), + token(0) {} }; /** diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/Editor.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/Editor.cxx --- geany-0.17/scintilla/Editor.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/Editor.cxx 2009-07-04 10:19:36.000000000 +0100 @@ -12,9 +12,6 @@ #include "Platform.h" -#ifndef PLAT_QT -#define INCLUDE_DEPRECATED_FEATURES -#endif #include "Scintilla.h" #include "SplitVector.h" @@ -187,7 +184,8 @@ wrapVisualFlags = 0; wrapVisualFlagsLocation = 0; wrapVisualStartIndent = 0; - actualWrapVisualStartIndent = 0; + wrapIndentMode = SC_WRAPINDENT_FIXED; + wrapAddIndent = 0; convertPastes = true; @@ -255,6 +253,15 @@ palette.Allocate(wMain); RefreshColourPalette(palette, false); } + if (wrapIndentMode == SC_WRAPINDENT_INDENT) { + wrapAddIndent = pdoc->IndentSize() * vs.spaceWidth; + } else if (wrapIndentMode == SC_WRAPINDENT_SAME) { + wrapAddIndent = 0; + } else { //SC_WRAPINDENT_FIXED + wrapAddIndent = wrapVisualStartIndent * vs.aveCharWidth; + if ((wrapVisualFlags & SC_WRAPVISUALFLAG_START) && (wrapAddIndent <= 0)) + wrapAddIndent = vs.aveCharWidth; // must indent to show start visual + } SetScrollBars(); } } @@ -451,10 +458,10 @@ for (int subLine = 0; subLine < ll->lines; subLine++) { if ((posInLine >= ll->LineStart(subLine)) && (posInLine <= ll->LineStart(subLine + 1))) { pt.x = ll->positions[posInLine] - ll->positions[ll->LineStart(subLine)]; - if (actualWrapVisualStartIndent != 0) { + if (ll->wrapIndent != 0) { int lineStart = ll->LineStart(subLine); if (lineStart != 0) // Wrapped - pt.x += actualWrapVisualStartIndent * vs.aveCharWidth; + pt.x += ll->wrapIndent; } } if (posInLine >= ll->LineStart(subLine)) { @@ -480,20 +487,31 @@ posTopLine = pdoc->LineStart(cs.DocFromDisplay(topLine)); } -int Editor::PositionFromLocation(Point pt) { +int Editor::PositionFromLocation(Point pt, bool canReturnInvalid, bool charPosition) { RefreshStyleData(); + if (canReturnInvalid) { + PRectangle rcClient = GetTextRectangle(); + if (!rcClient.Contains(pt)) + return INVALID_POSITION; + if (pt.x < vs.fixedColumnWidth) + return INVALID_POSITION; + if (pt.y < 0) + return INVALID_POSITION; + } pt.x = pt.x - vs.fixedColumnWidth + xOffset; int visibleLine = pt.y / vs.lineHeight + topLine; if (pt.y < 0) { // Division rounds towards 0 visibleLine = (pt.y - (vs.lineHeight - 1)) / vs.lineHeight + topLine; } - if (visibleLine < 0) + if (!canReturnInvalid && (visibleLine < 0)) visibleLine = 0; int lineDoc = cs.DocFromDisplay(visibleLine); + if (canReturnInvalid && (lineDoc < 0)) + return INVALID_POSITION; if (lineDoc >= pdoc->LinesTotal()) - return pdoc->Length(); + return canReturnInvalid ? INVALID_POSITION : pdoc->Length(); unsigned int posLineStart = pdoc->LineStart(lineDoc); - int retVal = posLineStart; + int retVal = canReturnInvalid ? INVALID_POSITION : static_cast(posLineStart); AutoSurface surface(this); AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc)); if (surface && ll) { @@ -505,74 +523,35 @@ int lineEnd = ll->LineLastVisible(subLine); int subLineStart = ll->positions[lineStart]; - if (actualWrapVisualStartIndent != 0) { + if (ll->wrapIndent != 0) { if (lineStart != 0) // Wrapped - pt.x -= actualWrapVisualStartIndent * vs.aveCharWidth; + pt.x -= ll->wrapIndent; } int i = ll->FindBefore(pt.x + subLineStart, lineStart, lineEnd); while (i < lineEnd) { - if ((pt.x + subLineStart) < ((ll->positions[i] + ll->positions[i + 1]) / 2)) { - return pdoc->MovePositionOutsideChar(i + posLineStart, 1); + if (charPosition) { + if ((pt.x + subLineStart) < (ll->positions[i + 1])) { + return pdoc->MovePositionOutsideChar(i + posLineStart, 1); + } + } else { + if ((pt.x + subLineStart) < ((ll->positions[i] + ll->positions[i + 1]) / 2)) { + return pdoc->MovePositionOutsideChar(i + posLineStart, 1); + } } i++; } - return lineEnd + posLineStart; - } - retVal = ll->numCharsInLine + posLineStart; - } - return retVal; -} - -// Like PositionFromLocation but INVALID_POSITION returned when not near any text. -int Editor::PositionFromLocationClose(Point pt) { - RefreshStyleData(); - PRectangle rcClient = GetTextRectangle(); - if (!rcClient.Contains(pt)) - return INVALID_POSITION; - if (pt.x < vs.fixedColumnWidth) - return INVALID_POSITION; - if (pt.y < 0) - return INVALID_POSITION; - pt.x = pt.x - vs.fixedColumnWidth + xOffset; - int visibleLine = pt.y / vs.lineHeight + topLine; - if (pt.y < 0) { // Division rounds towards 0 - visibleLine = (pt.y - (vs.lineHeight - 1)) / vs.lineHeight + topLine; - } - int lineDoc = cs.DocFromDisplay(visibleLine); - if (lineDoc < 0) - return INVALID_POSITION; - if (lineDoc >= pdoc->LinesTotal()) - return INVALID_POSITION; - AutoSurface surface(this); - AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc)); - if (surface && ll) { - LayoutLine(lineDoc, surface, vs, ll, wrapWidth); - unsigned int posLineStart = pdoc->LineStart(lineDoc); - int lineStartSet = cs.DisplayFromDoc(lineDoc); - int subLine = visibleLine - lineStartSet; - if (subLine < ll->lines) { - int lineStart = ll->LineStart(subLine); - int lineEnd = ll->LineLastVisible(subLine); - int subLineStart = ll->positions[lineStart]; - - if (actualWrapVisualStartIndent != 0) { - if (lineStart != 0) // Wrapped - pt.x -= actualWrapVisualStartIndent * vs.aveCharWidth; - } - int i = ll->FindBefore(pt.x + subLineStart, lineStart, lineEnd); - while (i < lineEnd) { - if ((pt.x + subLineStart) < ((ll->positions[i] + ll->positions[i + 1]) / 2)) { - return pdoc->MovePositionOutsideChar(i + posLineStart, 1); + if (canReturnInvalid) { + if (pt.x < (ll->positions[lineEnd] - subLineStart)) { + return pdoc->MovePositionOutsideChar(lineEnd + posLineStart, 1); } - i++; - } - if (pt.x < (ll->positions[lineEnd] - subLineStart)) { - return pdoc->MovePositionOutsideChar(lineEnd + posLineStart, 1); + } else { + return lineEnd + posLineStart; } } + if (!canReturnInvalid) + return ll->numCharsInLine + posLineStart; } - - return INVALID_POSITION; + return retVal; } /** @@ -596,9 +575,9 @@ int lineEnd = ll->LineLastVisible(subLine); int subLineStart = ll->positions[lineStart]; - if (actualWrapVisualStartIndent != 0) { + if (ll->wrapIndent != 0) { if (lineStart != 0) // Wrapped - x -= actualWrapVisualStartIndent * vs.aveCharWidth; + x -= ll->wrapIndent; } int i = ll->FindBefore(x + subLineStart, lineStart, lineEnd); while (i < lineEnd) { @@ -809,7 +788,7 @@ /** * Asks document to find a good position and then moves out of any invisible positions. */ -int Editor::MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd) { +int Editor::MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd) const { pos = pdoc->MovePositionOutsideChar(pos, moveDir, checkLineEnd); if (vs.ProtectionActive()) { int mask = pdoc->stylingBitsMask; @@ -846,7 +825,6 @@ if (ensureVisible) { EnsureCaretVisible(); } - NotifyMove(newPos); return 0; } @@ -979,7 +957,7 @@ where most code reside, and the lines after the caret, eg. the body of a function. | | | | | -slop | strict | jumps | even | Caret can go to the margin | When reaching limit(caret going out of +slop | strict | jumps | even | Caret can go to the margin | When reaching limit (caret going out of | | | | | visibility or going into the UZ) display is... -----+--------+-------+------+--------------------------------------------+-------------------------------------------------------------- 0 | 0 | 0 | 0 | Yes | moved to put caret on top/on right @@ -1277,7 +1255,8 @@ LayoutLine(lineToWrap, surface, vs, ll, wrapWidth); linesWrapped = ll->lines; } - 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. @@ -1315,7 +1294,8 @@ 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; } @@ -1457,6 +1437,84 @@ return static_cast(strlen(s)); } +bool ValidStyledText(ViewStyle &vs, size_t styleOffset, const StyledText &st) { + if (st.multipleStyles) { + for (size_t iStyle=0;iStyle(styles[endSegment+1]) == style)) + endSegment++; + width += surface->WidthText(vs.styles[style+styleOffset].font, text + start, endSegment - start + 1); + start = endSegment + 1; + } + return width; +} + +static int WidestLineWidth(Surface *surface, ViewStyle &vs, int styleOffset, const StyledText &st) { + int widthMax = 0; + size_t start = 0; + while (start < st.length) { + size_t lenLine = st.LineLength(start); + int widthSubLine; + if (st.multipleStyles) { + widthSubLine = WidthStyledText(surface, vs, styleOffset, st.text + start, st.styles + start, lenLine); + } else { + widthSubLine = surface->WidthText(vs.styles[styleOffset + st.style].font, st.text + start, lenLine); + } + if (widthSubLine > widthMax) + widthMax = widthSubLine; + start += lenLine + 1; + } + return widthMax; +} + +void DrawStyledText(Surface *surface, ViewStyle &vs, int styleOffset, PRectangle rcText, int ascent, + const StyledText &st, size_t start, size_t length) { + + if (st.multipleStyles) { + int x = rcText.left; + size_t i = 0; + while (i < length) { + size_t end = i; + int style = st.styles[i + start]; + while (end < length-1 && st.styles[start+end+1] == style) + end++; + style += styleOffset; + int width = surface->WidthText(vs.styles[style].font, st.text + start + i, end - i + 1); + PRectangle rcSegment = rcText; + rcSegment.left = x; + rcSegment.right = x + width + 1; + surface->DrawTextNoClip(rcSegment, vs.styles[style].font, + ascent, st.text + start + i, end - i + 1, + vs.styles[style].fore.allocated, + vs.styles[style].back.allocated); + x += width; + i = end + 1; + } + } else { + int style = st.style + styleOffset; + surface->DrawTextNoClip(rcText, vs.styles[style].font, + rcText.top + vs.maxAscent, st.text + start, length, + vs.styles[style].fore.allocated, + vs.styles[style].back.allocated); + } +} + void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) { if (vs.fixedColumnWidth == 0) return; @@ -1638,6 +1696,20 @@ rcNumber.top + vs.maxAscent, number, istrlen(number), vs.styles[STYLE_LINENUMBER].fore.allocated, vs.styles[STYLE_LINENUMBER].back.allocated); + } else if (vs.ms[margin].style == SC_MARGIN_TEXT || vs.ms[margin].style == SC_MARGIN_RTEXT) { + if (firstSubLine) { + const StyledText stMargin = pdoc->MarginStyledText(lineDoc); + if (stMargin.text && ValidStyledText(vs, vs.marginStyleOffset, stMargin)) { + 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, + stMargin, 0, stMargin.length); + } + } } if (marks) { @@ -1937,6 +2009,20 @@ if (wrapVisualFlags & SC_WRAPVISUALFLAG_END) { width -= vstyle.aveCharWidth; // take into account the space for end wrap mark } + ll->wrapIndent = wrapAddIndent; + if (wrapIndentMode != SC_WRAPINDENT_FIXED) + for (int i = 0; i < ll->numCharsInLine; i++) { + if (!IsSpaceOrTab(ll->chars[i])) { + ll->wrapIndent += ll->positions[i]; // Add line indent + break; + } + } + // Check for text width minimum + if (ll->wrapIndent > width - static_cast(vstyle.aveCharWidth) * 15) + ll->wrapIndent = wrapAddIndent; + // Check for wrapIndent minimum + if ((wrapVisualFlags & SC_WRAPVISUALFLAG_START) && (ll->wrapIndent < static_cast(vstyle.aveCharWidth))) + ll->wrapIndent = vstyle.aveCharWidth; // Indent to show start visual ll->lines = 0; // Calculate line start positions based upon width. int lastGoodBreak = 0; @@ -1962,7 +2048,7 @@ ll->SetLineStart(ll->lines, lastGoodBreak); startOffset = ll->positions[lastGoodBreak]; // take into account the space for start wrap mark and indent - startOffset -= actualWrapVisualStartIndent * vstyle.aveCharWidth; + startOffset -= ll->wrapIndent; p = lastGoodBreak + 1; continue; } @@ -2068,6 +2154,30 @@ } } +void DrawTextBlob(Surface *surface, ViewStyle &vsDraw, PRectangle rcSegment, + const char *s, ColourAllocated textBack, ColourAllocated textFore, bool twoPhaseDraw) { + if (!twoPhaseDraw) { + surface->FillRectangle(rcSegment, textBack); + } + Font &ctrlCharsFont = vsDraw.styles[STYLE_CONTROLCHAR].font; + int normalCharHeight = surface->Ascent(ctrlCharsFont) - + surface->InternalLeading(ctrlCharsFont); + PRectangle rcCChar = rcSegment; + rcCChar.left = rcCChar.left + 1; + rcCChar.top = rcSegment.top + vsDraw.maxAscent - normalCharHeight; + rcCChar.bottom = rcSegment.top + vsDraw.maxAscent + 1; + PRectangle rcCentral = rcCChar; + rcCentral.top++; + rcCentral.bottom--; + surface->FillRectangle(rcCentral, textFore); + PRectangle rcChar = rcCChar; + rcChar.left++; + rcChar.right--; + surface->DrawTextClipped(rcChar, ctrlCharsFont, + rcSegment.top + vsDraw.maxAscent, s, istrlen(s), + textBack, textFore); +} + void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll, int line, int lineEnd, int xStart, int subLine, int subLineStart, bool overrideBackground, ColourAllocated background, @@ -2197,28 +2307,56 @@ } } -void DrawTextBlob(Surface *surface, ViewStyle &vsDraw, PRectangle rcSegment, - const char *s, ColourAllocated textBack, ColourAllocated textFore, bool twoPhaseDraw) { - if (!twoPhaseDraw) { - surface->FillRectangle(rcSegment, textBack); +void Editor::DrawAnnotation(Surface *surface, ViewStyle &vsDraw, int line, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine) { + int indent = pdoc->GetLineIndentation(line) * vsDraw.spaceWidth; + PRectangle rcSegment = rcLine; + int annotationLine = subLine - ll->lines; + const StyledText stAnnotation = pdoc->AnnotationStyledText(line); + if (stAnnotation.text && ValidStyledText(vsDraw, vsDraw.annotationStyleOffset, stAnnotation)) { + surface->FillRectangle(rcSegment, vsDraw.styles[0].back.allocated); + if (vs.annotationVisible == ANNOTATION_BOXED) { + // Only care about calculating width if need to draw box + int widthAnnotation = WidestLineWidth(surface, vsDraw, vsDraw.annotationStyleOffset, stAnnotation); + widthAnnotation += vsDraw.spaceWidth * 2; // Margins + rcSegment.left = xStart + indent; + rcSegment.right = rcSegment.left + widthAnnotation; + surface->PenColour(vsDraw.styles[vsDraw.annotationStyleOffset].fore.allocated); + } else { + rcSegment.left = xStart; + } + const int annotationLines = pdoc->AnnotationLines(line); + size_t start = 0; + size_t lengthAnnotation = stAnnotation.LineLength(start); + int lineInAnnotation = 0; + while ((lineInAnnotation < annotationLine) && (start < stAnnotation.length)) { + start += lengthAnnotation + 1; + lengthAnnotation = stAnnotation.LineLength(start); + lineInAnnotation++; + } + PRectangle rcText = rcSegment; + if (vs.annotationVisible == ANNOTATION_BOXED) { + 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, + 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){ + 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); + } + } } - Font &ctrlCharsFont = vsDraw.styles[STYLE_CONTROLCHAR].font; - int normalCharHeight = surface->Ascent(ctrlCharsFont) - - surface->InternalLeading(ctrlCharsFont); - PRectangle rcCChar = rcSegment; - rcCChar.left = rcCChar.left + 1; - rcCChar.top = rcSegment.top + vsDraw.maxAscent - normalCharHeight; - rcCChar.bottom = rcSegment.top + vsDraw.maxAscent + 1; - PRectangle rcCentral = rcCChar; - rcCentral.top++; - rcCentral.bottom--; - surface->FillRectangle(rcCentral, textFore); - PRectangle rcChar = rcCChar; - rcChar.left++; - rcChar.right--; - surface->DrawTextClipped(rcChar, ctrlCharsFont, - rcSegment.top + vsDraw.maxAscent, s, istrlen(s), - textBack, textFore); } void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, @@ -2280,6 +2418,10 @@ int startseg = ll->LineStart(subLine); int subLineStart = ll->positions[startseg]; + if (subLine >= ll->lines) { + DrawAnnotation(surface, vsDraw, line, xStart, rcLine, ll, subLine); + return; // No further drawing + } int lineStart = 0; int lineEnd = 0; if (subLine < ll->lines) { @@ -2299,7 +2441,7 @@ } } - if (actualWrapVisualStartIndent != 0) { + if (ll->wrapIndent != 0) { bool continuedWrapLine = false; if (subLine < ll->lines) { @@ -2311,7 +2453,7 @@ PRectangle rcPlace = rcSegment; rcPlace.left = ll->positions[startseg] + xStart - subLineStart; - rcPlace.right = rcPlace.left + actualWrapVisualStartIndent * vsDraw.aveCharWidth; + rcPlace.right = rcPlace.left + ll->wrapIndent; // default bgnd here.. surface->FillRectangle(rcSegment, overrideBackground ? background : @@ -2332,7 +2474,7 @@ DrawWrapMarker(surface, rcPlace, false, wrapColour); } - xStart += actualWrapVisualStartIndent * vsDraw.aveCharWidth; + xStart += ll->wrapIndent; } } @@ -2414,6 +2556,19 @@ surface->FillRectangle(rcSegment, vsDraw.edgecolour.allocated); } + // Draw underline mark as part of background if not transparent + int marks = pdoc->GetMark(line); + int markBit; + for (markBit = 0; (markBit < 32) && marks; markBit++) { + if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_UNDERLINE) && + (vsDraw.markers[markBit].alpha == SC_ALPHA_NOALPHA)) { + PRectangle rcUnderline = rcLine; + rcUnderline.top = rcUnderline.bottom - 2; + surface->FillRectangle(rcUnderline, vsDraw.markers[markBit].back.allocated); + } + marks >>= 1; + } + inIndentation = subLine == 0; // Do not handle indentation except on first subline. // Foreground drawing loop BreakFinder bfFore(ll, lineStart, lineEnd, posLineStart, IsUnicodeMode(), xStartVisible); @@ -2630,17 +2785,21 @@ if (caret.active && vsDraw.showCaretLineBackground && ll->containsCaret) { SimpleAlphaRectangle(surface, rcSegment, vsDraw.caretLineBackground.allocated, vsDraw.caretLineAlpha); } - int marks = pdoc->GetMark(line); - for (int markBit = 0; (markBit < 32) && marks; markBit++) { + marks = pdoc->GetMark(line); + for (markBit = 0; (markBit < 32) && marks; markBit++) { if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND)) { SimpleAlphaRectangle(surface, rcSegment, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha); + } else if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_UNDERLINE)) { + PRectangle rcUnderline = rcSegment; + rcUnderline.top = rcUnderline.bottom - 2; + SimpleAlphaRectangle(surface, rcUnderline, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha); } marks >>= 1; } if (vsDraw.maskInLine) { int marksMasked = pdoc->GetMark(line) & vsDraw.maskInLine; if (marksMasked) { - for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) { + for (markBit = 0; (markBit < 32) && marksMasked; markBit++) { if ((marksMasked & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY)) { SimpleAlphaRectangle(surface, rcSegment, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha); } @@ -2693,8 +2852,15 @@ } // We now know what to draw, update the caret drawing rectangle - rcCaret.left = ll->positions[offsetFirstChar] - ll->positions[ll->LineStart(subLine)] + xStart; - rcCaret.right = ll->positions[offsetFirstChar+numCharsToDraw] - ll->positions[ll->LineStart(subLine)] + xStart; + rcCaret.left = ll->positions[offsetFirstChar] - ll->positions[lineStart] + xStart; + rcCaret.right = ll->positions[offsetFirstChar+numCharsToDraw] - ll->positions[lineStart] + xStart; + + // Adjust caret position to take into account any word wrapping symbols. + if ((ll->wrapIndent != 0) && (lineStart != 0)) { + int wordWrapCharWidth = ll->wrapIndent; + rcCaret.left += wordWrapCharWidth; + rcCaret.right += wordWrapCharWidth; + } // This character is where the caret block is, we override the colours // (inversed) for drawing the caret here. @@ -2793,7 +2959,7 @@ //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)); + endPosPaint = pdoc->LineStart(cs.DocFromDisplay(lineStyleLast) + 1); int xStart = vs.fixedColumnWidth - xOffset; int ypos = 0; @@ -2945,61 +3111,25 @@ ll->RestoreBracesHighlight(rangeLine, braces); bool expanded = cs.GetExpanded(lineDoc); - if ((foldFlags & SC_FOLDFLAG_BOX) == 0) { - // Paint the line above the fold - if ((expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_EXPANDED)) - || - (!expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_CONTRACTED))) { - if (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELHEADERFLAG) { - PRectangle rcFoldLine = rcLine; - rcFoldLine.bottom = rcFoldLine.top + 1; - surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated); - } - } - // Paint the line below the fold - if ((expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_EXPANDED)) - || - (!expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_CONTRACTED))) { - if (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELHEADERFLAG) { - PRectangle rcFoldLine = rcLine; - rcFoldLine.top = rcFoldLine.bottom - 1; - surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated); - } - } - } else { - int FoldLevelCurr = (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELNUMBERMASK) - SC_FOLDLEVELBASE; - int FoldLevelPrev = (pdoc->GetLevel(lineDoc - 1) & SC_FOLDLEVELNUMBERMASK) - SC_FOLDLEVELBASE; - int FoldLevelFlags = (pdoc->GetLevel(lineDoc) & ~SC_FOLDLEVELNUMBERMASK) & ~(0xFFF0000); - int indentationStep = pdoc->IndentSize(); - // Draw line above fold - if ((FoldLevelPrev < FoldLevelCurr) - || - (FoldLevelFlags & SC_FOLDLEVELBOXHEADERFLAG - && - (pdoc->GetLevel(lineDoc - 1) & SC_FOLDLEVELBOXFOOTERFLAG) == 0)) { + // Paint the line above the fold + if ((expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_EXPANDED)) + || + (!expanded && (foldFlags & SC_FOLDFLAG_LINEBEFORE_CONTRACTED))) { + if (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELHEADERFLAG) { PRectangle rcFoldLine = rcLine; rcFoldLine.bottom = rcFoldLine.top + 1; - rcFoldLine.left += xStart + FoldLevelCurr * vs.spaceWidth * indentationStep - 1; surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated); } - - // Line below the fold (or below a contracted fold) - if (FoldLevelFlags & SC_FOLDLEVELBOXFOOTERFLAG - || - (!expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_CONTRACTED))) { + } + // Paint the line below the fold + if ((expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_EXPANDED)) + || + (!expanded && (foldFlags & SC_FOLDFLAG_LINEAFTER_CONTRACTED))) { + if (pdoc->GetLevel(lineDoc) & SC_FOLDLEVELHEADERFLAG) { PRectangle rcFoldLine = rcLine; rcFoldLine.top = rcFoldLine.bottom - 1; - rcFoldLine.left += xStart + (FoldLevelCurr) * vs.spaceWidth * indentationStep - 1; surface->FillRectangle(rcFoldLine, vs.styles[STYLE_DEFAULT].fore.allocated); } - - PRectangle rcBoxLine = rcLine; - // Draw vertical line for every fold level - for (int i = 0; i <= FoldLevelCurr; i++) { - rcBoxLine.left = xStart + i * vs.spaceWidth * indentationStep - 1; - rcBoxLine.right = rcBoxLine.left + 1; - surface->FillRectangle(rcBoxLine, vs.styles[STYLE_DEFAULT].fore.allocated); - } } // Draw the Caret @@ -3008,10 +3138,10 @@ if (ll->InLine(offset, subLine)) { int xposCaret = ll->positions[offset] - ll->positions[ll->LineStart(subLine)] + xStart; - if (actualWrapVisualStartIndent != 0) { + if (ll->wrapIndent != 0) { int lineStart = ll->LineStart(subLine); if (lineStart != 0) // Wrapped - xposCaret += actualWrapVisualStartIndent * vs.aveCharWidth; + xposCaret += ll->wrapIndent; } if ((xposCaret >= 0) && (vs.caretWidth > 0) && (vs.caretStyle != CARETSTYLE_INVISIBLE) && ((posDrag >= 0) || (caret.active && caret.on))) { @@ -3133,7 +3263,7 @@ // This is mostly copied from the Paint method but with some things omitted // such as the margin markers, line numbers, selection and caret // Should be merged back into a combined Draw method. -long Editor::FormatRange(bool draw, RangeToFormat *pfr) { +long Editor::FormatRange(bool draw, Sci_RangeToFormat *pfr) { if (!pfr) return 0; @@ -3512,6 +3642,8 @@ } if (!pdoc->IsReadOnly()) { cs.Clear(); + pdoc->AnnotationClearAll(); + pdoc->MarginClearAll(); } pdoc->EndUndoAction(); anchor = 0; @@ -3574,7 +3706,7 @@ // Pad the end of lines with spaces if required currentPos = PositionFromLineX(line, xInsert); if ((XFromPosition(currentPos) < xInsert) && (i + 1 < len)) { - for (int i = 0; i < xInsert - XFromPosition(currentPos); i++) { + while (XFromPosition(currentPos) < xInsert) { pdoc->InsertChar(currentPos, ' '); currentPos++; } @@ -3766,7 +3898,7 @@ SCNotification scn = {0}; scn.nmhdr.code = SCN_DOUBLECLICK; scn.line = LineFromLocation(pt); - scn.position = PositionFromLocationClose(pt); + scn.position = PositionFromLocation(pt, true); scn.modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) | (alt ? SCI_ALT : 0); NotifyParent(scn); @@ -3847,7 +3979,7 @@ void Editor::NotifyDwelling(Point pt, bool state) { SCNotification scn = {0}; scn.nmhdr.code = state ? SCN_DWELLSTART : SCN_DWELLEND; - scn.position = PositionFromLocationClose(pt); + scn.position = PositionFromLocation(pt, true); scn.x = pt.x; scn.y = pt.y; NotifyParent(scn); @@ -3865,13 +3997,6 @@ NotifyModifyAttempt(); } -void Editor::NotifyMove(int position) { - SCNotification scn = {0}; - scn.nmhdr.code = SCN_POSCHANGED; - scn.position = position; - NotifyParent(scn); -} - void Editor::NotifySavePoint(Document*, void *, bool atSavePoint) { //Platform::DebugPrintf("** Save Point %s\n", atSavePoint ? "On" : "Off"); NotifySavePoint(atSavePoint); @@ -3885,6 +4010,10 @@ int lines = Platform::Maximum(0, mh.linesAdded); NeedWrapping(lineDoc, lineDoc + lines + 1); } + // Fix up annotation heights + int lineDoc = pdoc->LineFromPosition(mh.position); + int lines = Platform::Maximum(0, mh.linesAdded); + SetAnnotationHeights(lineDoc, lineDoc + lines + 2); } } @@ -3972,6 +4101,12 @@ cs.DeleteLines(lineOfPos, -mh.linesAdded); } } + if (mh.modificationType & SC_MOD_CHANGEANNOTATION) { + int lineDoc = pdoc->LineFromPosition(mh.position); + if (vs.annotationVisible) { + cs.SetHeight(lineDoc, cs.GetHeight(lineDoc) + mh.annotationLinesAdded); + } + } CheckModificationForWrap(mh); if (mh.linesAdded != 0) { // Avoid scrolling of display if change before current display @@ -4002,7 +4137,7 @@ SetScrollBars(); } - if (mh.modificationType & SC_MOD_CHANGEMARKER) { + if ((mh.modificationType & SC_MOD_CHANGEMARKER) || (mh.modificationType & SC_MOD_CHANGEMARGIN)) { if ((paintState == notPainting) || !PaintContainsMargin()) { if (mh.modificationType & SC_MOD_CHANGEFOLD) { // Fold changes can affect the drawing of following lines so redraw whole margin @@ -4036,6 +4171,8 @@ scn.line = mh.line; scn.foldLevelNow = mh.foldLevelNow; scn.foldLevelPrev = mh.foldLevelPrev; + scn.token = mh.token; + scn.annotationLinesAdded = mh.annotationLinesAdded; NotifyParent(scn); } } @@ -4305,8 +4442,16 @@ void Editor::CursorUpOrDown(int direction, selTypes sel) { Point pt = LocationFromPosition(currentPos); + int lineDoc = pdoc->LineFromPosition(currentPos); + 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)); + if ((direction > 0) && (subLine >= (cs.GetHeight(lineDoc) - 1 - commentLines))) { + posNew = PositionFromLocation( + Point(lastXChosen, pt.y + (commentLines + 1) * vs.lineHeight)); + } if (direction < 0) { // Line wrapping may lead to a location on the same line, so // seek back if that is the case. @@ -4611,6 +4756,7 @@ SetLastXChosen(); } EnsureCaretVisible(); + ShowCaretAtCurrentPosition(); // Avoid blinking break; case SCI_BACKTAB: Indent(false); @@ -4618,6 +4764,7 @@ SetLastXChosen(); } EnsureCaretVisible(); + ShowCaretAtCurrentPosition(); // Avoid blinking break; case SCI_NEWLINE: NewLine(); @@ -4891,7 +5038,7 @@ ///< @c SCFIND_WORDSTART, @c SCFIND_REGEXP or @c SCFIND_POSIX. sptr_t lParam) { ///< @c TextToFind structure: The text to search for in the given range. - TextToFind *ft = reinterpret_cast(lParam); + Sci_TextToFind *ft = reinterpret_cast(lParam); int lengthFound = istrlen(ft->lpstrText); int pos = pdoc->FindText(ft->chrg.cpMin, ft->chrg.cpMax, ft->lpstrText, (wParam & SCFIND_MATCHCASE) != 0, @@ -5408,7 +5555,7 @@ } bool Editor::PointIsHotspot(Point pt) { - int pos = PositionFromLocationClose(pt); + int pos = PositionFromLocation(pt, true); if (pos == INVALID_POSITION) return false; return PositionIsHotspot(pos); @@ -5740,6 +5887,14 @@ } } +void Editor::SetAnnotationHeights(int start, int end) { + if (vs.annotationVisible) { + for (int line=start; lineAnnotationLines(line) + 1); + } + } +} + void Editor::SetDocPointer(Document *document) { //Platform::DebugPrintf("** %x setdoc to %x\n", pdoc, document); pdoc->RemoveWatcher(this, 0); @@ -5764,6 +5919,7 @@ // Reset the contraction state to fully shown. cs.Clear(); cs.InsertLines(0, pdoc->LinesTotal() - 1); + SetAnnotationHeights(0, pdoc->LinesTotal()); llc.Deallocate(); NeedWrapping(); @@ -5772,6 +5928,22 @@ Redraw(); } +void Editor::SetAnnotationVisible(int visible) { + if (vs.annotationVisible != visible) { + bool changedFromOrToHidden = ((vs.annotationVisible != 0) != (visible != 0)); + vs.annotationVisible = visible; + if (changedFromOrToHidden) { + int dir = vs.annotationVisible ? 1 : -1; + for (int line=0; lineLinesTotal(); line++) { + int annotationLines = pdoc->AnnotationLines(line); + if (annotationLines > 0) { + cs.SetHeight(line, cs.GetHeight(line) + annotationLines * dir); + } + } + } + } +} + /** * Recursively expand a fold, making lines visible except where they have an unexpanded parent. */ @@ -6322,7 +6494,7 @@ case SCI_GETTEXTRANGE: { if (lParam == 0) return 0; - TextRange *tr = reinterpret_cast(lParam); + Sci_TextRange *tr = reinterpret_cast(lParam); int cpMax = tr->chrg.cpMax; if (cpMax == -1) cpMax = pdoc->Length(); @@ -6340,7 +6512,7 @@ break; case SCI_FORMATRANGE: - return FormatRange(wParam != 0, reinterpret_cast(lParam)); + return FormatRange(wParam != 0, reinterpret_cast(lParam)); case SCI_GETMARGINLEFT: return vs.leftMarginWidth; @@ -6521,7 +6693,7 @@ case SCI_GETSTYLEDTEXT: { if (lParam == 0) return 0; - TextRange *tr = reinterpret_cast(lParam); + Sci_TextRange *tr = reinterpret_cast(lParam); int iPlace = 0; for (int iChar = tr->chrg.cpMin; iChar < tr->chrg.cpMax; iChar++) { tr->lpstrText[iPlace++] = pdoc->CharAt(iChar); @@ -6551,10 +6723,16 @@ break; case SCI_POSITIONFROMPOINT: - return PositionFromLocation(Point(wParam, lParam)); + return PositionFromLocation(Point(wParam, lParam), false, false); case SCI_POSITIONFROMPOINTCLOSE: - return PositionFromLocationClose(Point(wParam, lParam)); + return PositionFromLocation(Point(wParam, lParam), true, false); + + case SCI_CHARPOSITIONFROMPOINT: + return PositionFromLocation(Point(wParam, lParam), false, true); + + case SCI_CHARPOSITIONFROMPOINTCLOSE: + return PositionFromLocation(Point(wParam, lParam), true, true); case SCI_GOTOLINE: GoToLine(wParam); @@ -6714,9 +6892,6 @@ case SCI_SETWRAPVISUALFLAGS: wrapVisualFlags = wParam; - actualWrapVisualStartIndent = wrapVisualStartIndent; - if ((wrapVisualFlags & SC_WRAPVISUALFLAG_START) && (actualWrapVisualStartIndent == 0)) - actualWrapVisualStartIndent = 1; // must indent to show start visual InvalidateStyleRedraw(); ReconfigureScrollBars(); break; @@ -6734,9 +6909,6 @@ case SCI_SETWRAPSTARTINDENT: wrapVisualStartIndent = wParam; - actualWrapVisualStartIndent = wrapVisualStartIndent; - if ((wrapVisualFlags & SC_WRAPVISUALFLAG_START) && (actualWrapVisualStartIndent == 0)) - actualWrapVisualStartIndent = 1; // must indent to show start visual InvalidateStyleRedraw(); ReconfigureScrollBars(); break; @@ -6744,6 +6916,15 @@ case SCI_GETWRAPSTARTINDENT: return wrapVisualStartIndent; + case SCI_SETWRAPINDENTMODE: + wrapIndentMode = wParam; + InvalidateStyleRedraw(); + ReconfigureScrollBars(); + break; + + case SCI_GETWRAPINDENTMODE: + return wrapIndentMode; + case SCI_SETLAYOUTCACHE: llc.SetLevel(wParam); break; @@ -6892,6 +7073,13 @@ InvalidateStyleData(); RedrawSelMargin(); break; + + case SCI_MARKERSYMBOLDEFINED: + if (wParam <= MARKER_MAX) + return vs.markers[wParam].markType; + else + return 0; + case SCI_MARKERSETFORE: if (wParam <= MARKER_MAX) vs.markers[wParam].fore.desired = ColourDesired(lParam); @@ -7162,13 +7350,6 @@ case SCI_SEARCHPREV: return SearchText(iMessage, wParam, lParam); -#ifdef INCLUDE_DEPRECATED_FEATURES - case SCI_SETCARETPOLICY: // Deprecated - caretXPolicy = caretYPolicy = wParam; - caretXSlop = caretYSlop = lParam; - break; -#endif - case SCI_SETXCARETPOLICY: caretXPolicy = wParam; caretXSlop = lParam; @@ -7304,6 +7485,16 @@ case SCI_INDICGETUNDER: return (wParam <= INDIC_MAX) ? vs.indicators[wParam].under : 0; + case SCI_INDICSETALPHA: + if (wParam <= INDIC_MAX && lParam >=0 && lParam <= 100) { + vs.indicators[wParam].fillAlpha = lParam; + InvalidateStyleRedraw(); + } + break; + + case SCI_INDICGETALPHA: + return (wParam <= INDIC_MAX) ? vs.indicators[wParam].fillAlpha : 0; + case SCI_SETINDICATORCURRENT: pdoc->decorations.SetCurrentIndicator(wParam); break; @@ -7675,6 +7866,138 @@ case SCI_GETCHARACTERPOINTER: return reinterpret_cast(pdoc->BufferPointer()); + case SCI_SETEXTRAASCENT: + vs.extraAscent = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_GETEXTRAASCENT: + return vs.extraAscent; + + case SCI_SETEXTRADESCENT: + vs.extraDescent = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_GETEXTRADESCENT: + return vs.extraDescent; + + case SCI_MARGINSETSTYLEOFFSET: + vs.marginStyleOffset = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_MARGINGETSTYLEOFFSET: + return vs.marginStyleOffset; + + case SCI_MARGINSETTEXT: + pdoc->MarginSetText(wParam, CharPtrFromSPtr(lParam)); + break; + + case SCI_MARGINGETTEXT: { + const StyledText st = pdoc->MarginStyledText(wParam); + if (lParam) { + if (st.text) + memcpy(CharPtrFromSPtr(lParam), st.text, st.length); + else + strcpy(CharPtrFromSPtr(lParam), ""); + } + return st.length; + } + + case SCI_MARGINSETSTYLE: + pdoc->MarginSetStyle(wParam, lParam); + break; + + case SCI_MARGINGETSTYLE: { + const StyledText st = pdoc->MarginStyledText(wParam); + return st.style; + } + + case SCI_MARGINSETSTYLES: + pdoc->MarginSetStyles(wParam, reinterpret_cast(lParam)); + break; + + case SCI_MARGINGETSTYLES: { + const StyledText st = pdoc->MarginStyledText(wParam); + if (lParam) { + if (st.styles) + memcpy(CharPtrFromSPtr(lParam), st.styles, st.length); + else + strcpy(CharPtrFromSPtr(lParam), ""); + } + return st.styles ? st.length : 0; + } + + case SCI_MARGINTEXTCLEARALL: + pdoc->MarginClearAll(); + break; + + case SCI_ANNOTATIONSETTEXT: + pdoc->AnnotationSetText(wParam, CharPtrFromSPtr(lParam)); + break; + + case SCI_ANNOTATIONGETTEXT: { + const StyledText st = pdoc->AnnotationStyledText(wParam); + if (lParam) { + if (st.text) + memcpy(CharPtrFromSPtr(lParam), st.text, st.length); + else + strcpy(CharPtrFromSPtr(lParam), ""); + } + return st.length; + } + + case SCI_ANNOTATIONGETSTYLE: { + const StyledText st = pdoc->AnnotationStyledText(wParam); + return st.style; + } + + case SCI_ANNOTATIONSETSTYLE: + pdoc->AnnotationSetStyle(wParam, lParam); + break; + + case SCI_ANNOTATIONSETSTYLES: + pdoc->AnnotationSetStyles(wParam, reinterpret_cast(lParam)); + break; + + case SCI_ANNOTATIONGETSTYLES: { + const StyledText st = pdoc->AnnotationStyledText(wParam); + if (lParam) { + if (st.styles) + memcpy(CharPtrFromSPtr(lParam), st.styles, st.length); + else + strcpy(CharPtrFromSPtr(lParam), ""); + } + return st.styles ? st.length : 0; + } + + case SCI_ANNOTATIONGETLINES: + return pdoc->AnnotationLines(wParam); + + case SCI_ANNOTATIONCLEARALL: + pdoc->AnnotationClearAll(); + break; + + case SCI_ANNOTATIONSETVISIBLE: + SetAnnotationVisible(wParam); + break; + + case SCI_ANNOTATIONGETVISIBLE: + return vs.annotationVisible; + + case SCI_ANNOTATIONSETSTYLEOFFSET: + vs.annotationStyleOffset = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_ANNOTATIONGETSTYLEOFFSET: + return vs.annotationStyleOffset; + + case SCI_ADDUNDOACTION: + pdoc->AddUndoAction(wParam, lParam & UNDO_MAY_COALESCE); + break; + default: return DefWndProc(iMessage, wParam, lParam); } diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/Editor.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/Editor.h --- geany-0.17/scintilla/Editor.h 2008-03-26 16:42:50.000000000 +0000 +++ geany-0.18/scintilla/Editor.h 2009-07-04 10:19:36.000000000 +0100 @@ -125,7 +125,6 @@ bool hasFocus; bool hideSelection; bool inOverstrike; - int errorStatus; bool mouseDownCaptures; /** In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to @@ -236,7 +235,8 @@ int wrapVisualFlags; int wrapVisualFlagsLocation; int wrapVisualStartIndent; - int actualWrapVisualStartIndent; + int wrapAddIndent; // This will be added to initial indent of line + int wrapIndentMode; // SC_WRAPINDENT_FIXED, _SAME, _INDENT bool convertPastes; @@ -261,8 +261,7 @@ int MaxScrollPos(); Point LocationFromPosition(int pos); int XFromPosition(int pos); - int PositionFromLocation(Point pt); - int PositionFromLocationClose(Point pt); + int PositionFromLocation(Point pt, bool canReturnInvalid=false, bool charPosition=false); int PositionFromLineX(int line, int x); int LineFromLocation(Point pt); void SetTopLine(int topLineNew); @@ -285,7 +284,7 @@ void SetEmptySelection(int currentPos_); bool RangeContainsProtected(int start, int end) const; bool SelectionContainsProtected(); - int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true); + 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); void SetLastXChosen(); @@ -322,12 +321,14 @@ bool drawWrapMark, ColourAllocated wrapColour); void DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart, PRectangle rcLine, LineLayout *ll, int subLine, int lineEnd, bool under); + 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); void RefreshPixMaps(Surface *surfaceWindow); void Paint(Surface *surfaceWindow, PRectangle rcArea); - long FormatRange(bool draw, RangeToFormat *pfr); + long FormatRange(bool draw, Sci_RangeToFormat *pfr); int TextWidth(int style, const char *text); virtual void SetVerticalScrollPos() = 0; @@ -362,7 +363,6 @@ virtual void NotifyParent(SCNotification scn) = 0; virtual void NotifyStyleToNeeded(int endStyleNeeded); void NotifyChar(int ch); - void NotifyMove(int position); void NotifySavePoint(bool isSavePoint); void NotifyModifyAttempt(); virtual void NotifyDoubleClick(Point pt, bool shift, bool ctrl, bool alt); @@ -443,7 +443,10 @@ void CheckForChangeOutsidePaint(Range r); void SetBraceHighlight(Position pos0, Position pos1, int matchStyle); + void SetAnnotationHeights(int start, int end); void SetDocPointer(Document *document); + + void SetAnnotationVisible(int visible); void Expand(int &line, bool doExpand); void ToggleContraction(int line); @@ -473,6 +476,8 @@ virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); // Public so scintilla_set_id can use it. int ctrlID; + // Public so COM methods for drag and drop can set it. + int errorStatus; friend class AutoSurface; friend class SelectionLineIterator; }; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/Accessor.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/Accessor.h --- geany-0.17/scintilla/include/Accessor.h 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.18/scintilla/include/Accessor.h 2009-05-03 18:49:33.000000000 +0100 @@ -1,9 +1,9 @@ -/* Scintilla source code edit control */ +// Scintilla source code edit control /** @file Accessor.h ** Rapid easy access to contents of a Scintilla. **/ -/* Copyright 1998-2001 by Neil Hodgson - * The License.txt file describes the conditions under which this software may be distributed. */ +// Copyright 1998-2001 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. enum { wsSpace = 1, wsTab = 2, wsSpaceTab = 4, wsInconsistent=8}; @@ -25,7 +25,7 @@ char buf[bufferSize+1]; int startPos; int endPos; - int codePage; + int codePage; virtual bool InternalIsLeadByte(char ch)=0; virtual void Fill(int position)=0; @@ -44,7 +44,7 @@ if (position < startPos || position >= endPos) { Fill(position); if (position < startPos || position >= endPos) { - /* Position is outside range of document */ + // Position is outside range of document return chDefault; } } @@ -67,7 +67,7 @@ virtual int GetPropertyInt(const char *key, int defaultValue=0)=0; virtual char *GetProperties()=0; - /* Style setting */ + // Style setting virtual void StartAt(unsigned int start, char chMask=31)=0; virtual void SetFlags(char chFlags_, char chWhile_)=0; virtual unsigned int GetStartSegment()=0; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/KeyWords.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/KeyWords.h --- geany-0.17/scintilla/include/KeyWords.h 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.18/scintilla/include/KeyWords.h 2009-05-03 18:49:33.000000000 +0100 @@ -1,9 +1,9 @@ -/* Scintilla source code edit control */ +// Scintilla source code edit control /** @file KeyWords.h ** Colourise for particular languages. **/ -/* Copyright 1998-2001 by Neil Hodgson - * The License.txt file describes the conditions under which this software may be distributed. */ +// Copyright 1998-2001 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. #ifdef SCI_NAMESPACE namespace Scintilla { @@ -11,7 +11,7 @@ typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler); - + /** * A LexerModule is responsible for lexing and folding a particular language. * The class maintains a list of LexerModules which can be searched to find a @@ -31,9 +31,9 @@ public: const char *languageName; - LexerModule(int language_, - LexerFunction fnLexer_, - const char *languageName_=0, + LexerModule(int language_, + LexerFunction fnLexer_, + const char *languageName_=0, LexerFunction fnFolder_=0, const char * const wordListDescriptions_[] = NULL, int styleBits_=5); @@ -41,7 +41,7 @@ } int GetLanguage() const { return language; } - /* -1 is returned if no WordList information is available */ + // -1 is returned if no WordList information is available int GetNumWordLists() const; const char *GetWordListDescription(int index) const; @@ -78,7 +78,7 @@ inline bool isoperator(char ch) { if (isascii(ch) && isalnum(ch)) return false; - /* '.' left out as it is used to make up numbers */ + // '.' left out as it is used to make up numbers if (ch == '%' || ch == '^' || ch == '&' || ch == '*' || ch == '(' || ch == ')' || ch == '-' || ch == '+' || ch == '=' || ch == '|' || ch == '{' || ch == '}' || diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/Makefile.in --- geany-0.17/scintilla/include/Makefile.in 2009-05-02 18:50:13.000000000 +0100 +++ geany-0.18/scintilla/include/Makefile.in 2009-08-16 18:29:21.000000000 +0100 @@ -80,16 +80,14 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GEANY_DATA_DIR = @GEANY_DATA_DIR@ -GEANY_PIXMAPS_DIR = @GEANY_PIXMAPS_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -109,10 +107,12 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -121,13 +121,18 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -149,7 +154,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -180,6 +185,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/Platform.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/Platform.h --- geany-0.17/scintilla/include/Platform.h 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.18/scintilla/include/Platform.h 2009-07-04 10:19:36.000000000 +0100 @@ -1,18 +1,18 @@ -/* Scintilla source code edit control */ +// Scintilla source code edit control /** @file Platform.h ** Interface to platform facilities. Also includes some basic utilities. ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows. **/ -/* Copyright 1998-2003 by Neil Hodgson - * The License.txt file describes the conditions under which this software may be distributed. */ +// Copyright 1998-2009 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. #ifndef PLATFORM_H #define PLATFORM_H -/* PLAT_GTK = GTK+ on Linux or Win32 - * PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32 - * PLAT_WIN = Win32 API on Win32 OS - * PLAT_WX is wxWindows on any supported platform */ +// PLAT_GTK = GTK+ on Linux or Win32 +// PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32 +// PLAT_WIN = Win32 API on Win32 OS +// PLAT_WX is wxWindows on any supported platform #define PLAT_GTK 0 #define PLAT_GTK_WIN32 0 @@ -38,7 +38,8 @@ #define PLAT_GTK_WIN32 1 #endif -#elif defined(MACOSX) +#elif defined(__APPLE__) + #undef PLAT_MACOSX #define PLAT_MACOSX 1 @@ -52,8 +53,8 @@ namespace Scintilla { #endif -/* Underlying the implementation of the platform classes are platform specific types. - * Sometimes these need to be passed around by client code so they are defined here */ +// Underlying the implementation of the platform classes are platform specific types. +// Sometimes these need to be passed around by client code so they are defined here typedef void *FontID; typedef void *SurfaceID; @@ -75,7 +76,7 @@ explicit Point(int x_=0, int y_=0) : x(x_), y(y_) { } - /* Other automatically defined methods (assignment, copy constructor, destructor) are fine */ + // Other automatically defined methods (assignment, copy constructor, destructor) are fine static Point FromLong(long lpoint); }; @@ -96,7 +97,7 @@ left(left_), top(top_), right(right_), bottom(bottom_) { } - /* Other automatically defined methods (assignment, copy constructor, destructor) are fine */ + // Other automatically defined methods (assignment, copy constructor, destructor) are fine bool operator==(PRectangle &rc) { return (rc.left == left) && (rc.right == right) && @@ -240,7 +241,7 @@ } }; -class Window; /* Forward declaration for Palette */ +class Window; // Forward declaration for Palette /** * Colour palette management. @@ -250,10 +251,10 @@ int size; ColourPair *entries; #if PLAT_GTK - void *allocatedPalette; /* GdkColor * */ + void *allocatedPalette; // GdkColor * int allocatedLen; #endif - /* Private so Palette objects can not be copied */ + // Private so Palette objects can not be copied Palette(const Palette &) {} Palette &operator=(const Palette &) { return *this; } public: @@ -282,13 +283,13 @@ */ class Font { protected: - FontID id; + FontID fid; #if PLAT_WX int ascent; #endif - /* Private so Font objects can not be copied */ + // Private so Font objects can not be copied Font(const Font &) {} - Font &operator=(const Font &) { id=0; return *this; } + Font &operator=(const Font &) { fid=0; return *this; } public: Font(); virtual ~Font(); @@ -297,9 +298,9 @@ bool bold, bool italic, bool extraFontFlag=false); virtual void Release(); - FontID GetID() { return id; } - /* Alias another font - caller guarantees not to Release */ - void SetID(FontID id_) { id = id_; } + FontID GetID() { return fid; } + // Alias another font - caller guarantees not to Release + void SetID(FontID fid_) { fid = fid_; } friend class Surface; friend class SurfaceImpl; }; @@ -309,7 +310,7 @@ */ class Surface { private: - /* Private so Surface objects can not be copied */ + // Private so Surface objects can not be copied Surface(const Surface &) {} Surface &operator=(const Surface &) { return *this; } public: @@ -370,31 +371,31 @@ */ class Window { protected: - WindowID id; + WindowID wid; #if PLAT_MACOSX void *windowRef; void *control; #endif public: - Window() : id(0), cursorLast(cursorInvalid) { + Window() : wid(0), cursorLast(cursorInvalid) { #if PLAT_MACOSX windowRef = 0; control = 0; #endif } - Window(const Window &source) : id(source.id), cursorLast(cursorInvalid) { + Window(const Window &source) : wid(source.wid), cursorLast(cursorInvalid) { #if PLAT_MACOSX windowRef = 0; control = 0; #endif } virtual ~Window(); - Window &operator=(WindowID id_) { - id = id_; + Window &operator=(WindowID wid_) { + wid = wid_; return *this; } - WindowID GetID() const { return id; } - bool Created() const { return id != 0; } + WindowID GetID() const { return wid; } + bool Created() const { return wid != 0; } void Destroy(); bool HasFocus(); PRectangle GetPosition(); @@ -451,10 +452,10 @@ * Menu management. */ class Menu { - MenuID id; + MenuID mid; public: Menu(); - MenuID GetID() { return id; } + MenuID GetID() { return mid; } void CreatePopUp(); void Destroy(); void Show(Point pt, Window &w); @@ -475,13 +476,13 @@ public: virtual ~DynamicLibrary() {}; - /** @return Pointer to function "name", or NULL on failure. */ + /// @return Pointer to function "name", or NULL on failure. virtual Function FindFunction(const char *name) = 0; - /** @return true if the library was loaded successfully. */ + /// @return true if the library was loaded successfully. virtual bool IsValid() = 0; - /** @return An instance of a DynamicLibrary subclass with "modulePath" loaded. */ + /// @return An instance of a DynamicLibrary subclass with "modulePath" loaded. static DynamicLibrary *Load(const char *modulePath); }; @@ -490,12 +491,12 @@ * and chrome colour. Not a creatable object, more of a module with several functions. */ class Platform { - /* Private so Platform objects can not be copied */ + // Private so Platform objects can not be copied Platform(const Platform &) {} Platform &operator=(const Platform &) { return *this; } public: - /* Should be private because no new Platforms are ever created - * but gcc warns about this */ + // Should be private because no new Platforms are ever created + // but gcc warns about this Platform() {} ~Platform() {} static ColourDesired Chrome(); @@ -514,10 +515,10 @@ static int DBCSCharLength(int codePage, const char *s); static int DBCSCharMaxLength(); - /* These are utility functions not really tied to a platform */ + // These are utility functions not really tied to a platform static int Minimum(int a, int b); static int Maximum(int a, int b); - /* Next three assume 16 bit shorts and 32 bit longs */ + // Next three assume 16 bit shorts and 32 bit longs static long LongFromTwoShorts(short a,short b) { return (a) | ((b) << 16); } @@ -547,7 +548,7 @@ } #endif -/* Shut up annoying Visual C++ warnings: */ +// Shut up annoying Visual C++ warnings: #ifdef _MSC_VER #pragma warning(disable: 4244 4309 4514 4710) #endif diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/PropSet.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/PropSet.h --- geany-0.17/scintilla/include/PropSet.h 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.18/scintilla/include/PropSet.h 2009-05-03 18:49:33.000000000 +0100 @@ -1,9 +1,9 @@ -/* Scintilla source code edit control */ +// Scintilla source code edit control /** @file PropSet.h ** A Java style properties file module. **/ -/* Copyright 1998-2002 by Neil Hodgson - * The License.txt file describes the conditions under which this software may be distributed. */ +// Copyright 1998-2002 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. #ifndef PROPSET_H #define PROPSET_H @@ -56,10 +56,10 @@ 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 */ + char *ToString() const; // Caller must delete[] the return value private: - /* copy-value semantics not implemented */ + // copy-value semantics not implemented PropSet(const PropSet ©); void operator=(const PropSet &assign); }; @@ -68,11 +68,11 @@ */ class WordList { public: - /* Each word contains at least one character - a empty word acts as sentinel at the end. */ + // 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 onlyLineEnds; ///< Delimited by any white space or only line ends bool sorted; int starts[256]; WordList(bool onlyLineEnds_ = false) : @@ -96,8 +96,8 @@ #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. */ +// 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 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/SciLexer.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/SciLexer.h --- geany-0.17/scintilla/include/SciLexer.h 2009-01-18 18:18:38.000000000 +0000 +++ geany-0.18/scintilla/include/SciLexer.h 2009-07-30 12:29:53.000000000 +0100 @@ -13,7 +13,7 @@ /* SciLexer features - not in standard Scintilla */ -/*++Autogenerated -- start of section automatically generated from Scintilla.iface*/ +/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */ #define SCLEX_CONTAINER 0 #define SCLEX_NULL 1 #define SCLEX_PYTHON 2 @@ -103,6 +103,14 @@ #define SCLEX_POWERSHELL 88 #define SCLEX_MYSQL 89 #define SCLEX_PO 90 +#define SCLEX_TAL 91 +#define SCLEX_COBOL 92 +#define SCLEX_TACL 93 +#define SCLEX_SORCUS 94 +#define SCLEX_POWERPRO 95 +#define SCLEX_NIMROD 96 +#define SCLEX_SML 97 +#define SCLEX_MARKDOWN 98 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -158,6 +166,11 @@ #define SCE_D_COMMENTLINEDOC 15 #define SCE_D_COMMENTDOCKEYWORD 16 #define SCE_D_COMMENTDOCKEYWORDERROR 17 +#define SCE_D_STRINGB 18 +#define SCE_D_STRINGR 19 +#define SCE_D_WORD5 20 +#define SCE_D_WORD6 21 +#define SCE_D_WORD7 22 #define SCE_TCL_DEFAULT 0 #define SCE_TCL_COMMENT 1 #define SCE_TCL_COMMENTLINE 2 @@ -926,6 +939,7 @@ #define SCE_CAML_OPERATOR 7 #define SCE_CAML_NUMBER 8 #define SCE_CAML_CHAR 9 +#define SCE_CAML_WHITE 10 #define SCE_CAML_STRING 11 #define SCE_CAML_COMMENT 12 #define SCE_CAML_COMMENT1 13 @@ -1084,6 +1098,7 @@ #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 #define SCE_INNO_KEYWORD_USER 9 @@ -1262,6 +1277,29 @@ #define SCE_MYSQL_USER1 18 #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 @@ -1271,8 +1309,63 @@ #define SCE_PO_MSGCTXT 6 #define SCE_PO_MSGCTXT_TEXT 7 #define SCE_PO_FUZZY 8 -#define SCLEX_ASP 29 -#define SCLEX_PHP 30 -/*--Autogenerated -- end of section automatically generated from Scintilla.iface*/ +#define SCE_PAS_DEFAULT 0 +#define SCE_PAS_IDENTIFIER 1 +#define SCE_PAS_COMMENT 2 +#define SCE_PAS_COMMENT2 3 +#define SCE_PAS_COMMENTLINE 4 +#define SCE_PAS_PREPROCESSOR 5 +#define SCE_PAS_PREPROCESSOR2 6 +#define SCE_PAS_NUMBER 7 +#define SCE_PAS_HEXNUMBER 8 +#define SCE_PAS_WORD 9 +#define SCE_PAS_STRING 10 +#define SCE_PAS_STRINGEOL 11 +#define SCE_PAS_CHARACTER 12 +#define SCE_PAS_OPERATOR 13 +#define SCE_PAS_ASM 14 +#define SCE_SORCUS_DEFAULT 0 +#define SCE_SORCUS_COMMAND 1 +#define SCE_SORCUS_PARAMETER 2 +#define SCE_SORCUS_COMMENTLINE 3 +#define SCE_SORCUS_STRING 4 +#define SCE_SORCUS_STRINGEOL 5 +#define SCE_SORCUS_IDENTIFIER 6 +#define SCE_SORCUS_OPERATOR 7 +#define SCE_SORCUS_NUMBER 8 +#define SCE_SORCUS_CONSTANT 9 +#define SCE_POWERPRO_DEFAULT 0 +#define SCE_POWERPRO_COMMENTBLOCK 1 +#define SCE_POWERPRO_COMMENTLINE 2 +#define SCE_POWERPRO_NUMBER 3 +#define SCE_POWERPRO_WORD 4 +#define SCE_POWERPRO_WORD2 5 +#define SCE_POWERPRO_WORD3 6 +#define SCE_POWERPRO_WORD4 7 +#define SCE_POWERPRO_DOUBLEQUOTEDSTRING 8 +#define SCE_POWERPRO_SINGLEQUOTEDSTRING 9 +#define SCE_POWERPRO_LINECONTINUE 10 +#define SCE_POWERPRO_OPERATOR 11 +#define SCE_POWERPRO_IDENTIFIER 12 +#define SCE_POWERPRO_STRINGEOL 13 +#define SCE_POWERPRO_VERBATIM 14 +#define SCE_POWERPRO_ALTQUOTE 15 +#define SCE_POWERPRO_FUNCTION 16 +#define SCE_SML_DEFAULT 0 +#define SCE_SML_IDENTIFIER 1 +#define SCE_SML_TAGNAME 2 +#define SCE_SML_KEYWORD 3 +#define SCE_SML_KEYWORD2 4 +#define SCE_SML_KEYWORD3 5 +#define SCE_SML_LINENUM 6 +#define SCE_SML_OPERATOR 7 +#define SCE_SML_NUMBER 8 +#define SCE_SML_CHAR 9 +#define SCE_SML_STRING 11 +#define SCE_SML_COMMENT 12 +#define SCE_SML_COMMENT1 13 +#define SCE_SML_COMMENT2 14 +#define SCE_SML_COMMENT3 15 +/* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/Scintilla.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/Scintilla.h --- geany-0.17/scintilla/include/Scintilla.h 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/include/Scintilla.h 2009-07-04 10:19:36.000000000 +0100 @@ -3,9 +3,9 @@ ** Interface to the edit control. **/ /* Copyright 1998-2003 by Neil Hodgson - * The License.txt file describes the conditions under which this software may be distributed. + * The License.txt file describes the conditions under which this software may be distributed. */ - * Most of this file is automatically generated from the Scintilla.iface interface definition +/* Most of this file is automatically generated from the Scintilla.iface interface definition * file which contains any comments about the definitions. HFacer.py does the generation. */ #ifndef SCINTILLA_H @@ -25,8 +25,8 @@ /* 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. */ -#if _MSC_VER >= 1300 -#include +#if defined(_WIN32) +#include #endif #ifdef MAXULONG_PTR typedef ULONG_PTR uptr_t; @@ -38,7 +38,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); -/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */ +/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */ #define INVALID_POSITION -1 #define SCI_START 2000 #define SCI_OPTIONAL_START 3000 @@ -119,6 +119,8 @@ #define SC_MARK_PIXMAP 25 #define SC_MARK_FULLRECT 26 #define SC_MARK_LEFTRECT 27 +#define SC_MARK_AVAILABLE 28 +#define SC_MARK_UNDERLINE 29 #define SC_MARK_CHARACTER 10000 #define SC_MARKNUM_FOLDEREND 25 #define SC_MARKNUM_FOLDEROPENMID 26 @@ -144,6 +146,8 @@ #define SC_MARGIN_NUMBER 1 #define SC_MARGIN_BACK 2 #define SC_MARGIN_FORE 3 +#define SC_MARGIN_TEXT 4 +#define SC_MARGIN_RTEXT 5 #define SCI_SETMARGINTYPEN 2240 #define SCI_GETMARGINTYPEN 2241 #define SCI_SETMARGINWIDTHN 2242 @@ -395,10 +399,6 @@ #define SC_FOLDLEVELBASE 0x400 #define SC_FOLDLEVELWHITEFLAG 0x1000 #define SC_FOLDLEVELHEADERFLAG 0x2000 -#define SC_FOLDLEVELBOXHEADERFLAG 0x4000 -#define SC_FOLDLEVELBOXFOOTERFLAG 0x8000 -#define SC_FOLDLEVELCONTRACTED 0x10000 -#define SC_FOLDLEVELUNINDENT 0x20000 #define SC_FOLDLEVELNUMBERMASK 0x0FFF #define SCI_SETFOLDLEVEL 2222 #define SCI_GETFOLDLEVEL 2223 @@ -416,7 +416,6 @@ #define SC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008 #define SC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010 #define SC_FOLDFLAG_LEVELNUMBERS 0x0040 -#define SC_FOLDFLAG_BOX 0x0001 #define SCI_SETFOLDFLAGS 2233 #define SCI_ENSUREVISIBLEENFORCEPOLICY 2234 #define SCI_SETTABINDENTS 2260 @@ -445,6 +444,11 @@ #define SCI_GETWRAPVISUALFLAGSLOCATION 2463 #define SCI_SETWRAPSTARTINDENT 2464 #define SCI_GETWRAPSTARTINDENT 2465 +#define SC_WRAPINDENT_FIXED 0 +#define SC_WRAPINDENT_SAME 1 +#define SC_WRAPINDENT_INDENT 2 +#define SCI_SETWRAPINDENTMODE 2472 +#define SCI_GETWRAPINDENTMODE 2473 #define SC_CACHE_NONE 0 #define SC_CACHE_CARET 1 #define SC_CACHE_PAGE 2 @@ -560,6 +564,9 @@ #define SCI_GETMODEVENTMASK 2378 #define SCI_SETFOCUS 2380 #define SCI_GETFOCUS 2381 +#define SC_STATUS_OK 0 +#define SC_STATUS_FAILURE 1 +#define SC_STATUS_BADALLOC 2 #define SCI_SETSTATUS 2382 #define SCI_GETSTATUS 2383 #define SCI_SETMOUSEDOWNCAPTURES 2384 @@ -671,6 +678,41 @@ #define SCI_GETCHARACTERPOINTER 2520 #define SCI_SETKEYSUNICODE 2521 #define SCI_GETKEYSUNICODE 2522 +#define SCI_INDICSETALPHA 2523 +#define SCI_INDICGETALPHA 2524 +#define SCI_SETEXTRAASCENT 2525 +#define SCI_GETEXTRAASCENT 2526 +#define SCI_SETEXTRADESCENT 2527 +#define SCI_GETEXTRADESCENT 2528 +#define SCI_MARKERSYMBOLDEFINED 2529 +#define SCI_MARGINSETTEXT 2530 +#define SCI_MARGINGETTEXT 2531 +#define SCI_MARGINSETSTYLE 2532 +#define SCI_MARGINGETSTYLE 2533 +#define SCI_MARGINSETSTYLES 2534 +#define SCI_MARGINGETSTYLES 2535 +#define SCI_MARGINTEXTCLEARALL 2536 +#define SCI_MARGINSETSTYLEOFFSET 2537 +#define SCI_MARGINGETSTYLEOFFSET 2538 +#define SCI_ANNOTATIONSETTEXT 2540 +#define SCI_ANNOTATIONGETTEXT 2541 +#define SCI_ANNOTATIONSETSTYLE 2542 +#define SCI_ANNOTATIONGETSTYLE 2543 +#define SCI_ANNOTATIONSETSTYLES 2544 +#define SCI_ANNOTATIONGETSTYLES 2545 +#define SCI_ANNOTATIONGETLINES 2546 +#define SCI_ANNOTATIONCLEARALL 2547 +#define ANNOTATION_HIDDEN 0 +#define ANNOTATION_STANDARD 1 +#define ANNOTATION_BOXED 2 +#define SCI_ANNOTATIONSETVISIBLE 2548 +#define SCI_ANNOTATIONGETVISIBLE 2549 +#define SCI_ANNOTATIONSETSTYLEOFFSET 2550 +#define SCI_ANNOTATIONGETSTYLEOFFSET 2551 +#define UNDO_MAY_COALESCE 1 +#define SCI_ADDUNDOACTION 2560 +#define SCI_CHARPOSITIONFROMPOINT 2561 +#define SCI_CHARPOSITIONFROMPOINTCLOSE 2562 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 #define SCI_SETLEXER 4001 @@ -701,7 +743,10 @@ #define SC_STARTACTION 0x2000 #define SC_MOD_CHANGEINDICATOR 0x4000 #define SC_MOD_CHANGELINESTATE 0x8000 -#define SC_MODEVENTMASKALL 0xFFFF +#define SC_MOD_CHANGEMARGIN 0x10000 +#define SC_MOD_CHANGEANNOTATION 0x20000 +#define SC_MOD_CONTAINER 0x40000 +#define SC_MODEVENTMASKALL 0x7FFFF #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 #define SCEN_KILLFOCUS 256 @@ -754,7 +799,8 @@ #define SCN_INDICATORCLICK 2023 #define SCN_INDICATORRELEASE 2024 #define SCN_AUTOCCANCELLED 2025 -/*--Autogenerated -- end of section automatically generated from Scintilla.iface */ +#define SCN_AUTOCCHARDELETED 2026 +/* --Autogenerated -- end of section automatically generated from Scintilla.iface */ /* These structures are defined to be exactly the same shape as the Win32 * CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs. @@ -764,38 +810,44 @@ namespace Scintilla { #endif -struct CharacterRange { +struct Sci_CharacterRange { long cpMin; long cpMax; }; -struct TextRange { - struct CharacterRange chrg; +struct Sci_TextRange { + struct Sci_CharacterRange chrg; char *lpstrText; }; -struct TextToFind { - struct CharacterRange chrg; +struct Sci_TextToFind { + struct Sci_CharacterRange chrg; char *lpstrText; - struct CharacterRange chrgText; + struct Sci_CharacterRange chrgText; }; +#define CharacterRange Sci_CharacterRange +#define TextRange Sci_TextRange +#define TextToFind Sci_TextToFind + #ifdef PLATFORM_H /* This structure is used in printing and requires some of the graphics types * from Platform.h. Not needed by most client code. */ -struct RangeToFormat { +struct Sci_RangeToFormat { SurfaceID hdc; SurfaceID hdcTarget; PRectangle rc; PRectangle rcPage; - CharacterRange chrg; + Sci_CharacterRange chrg; }; +#define RangeToFormat Sci_RangeToFormat + #endif -struct NotifyHeader { +struct Sci_NotifyHeader { /* Compatible with Windows NMHDR. * hwndFrom is really an environment specific window handle or pointer * but most clients of Scintilla.h do not have this type visible. */ @@ -804,8 +856,10 @@ unsigned int code; }; +#define NotifyHeader Sci_NotifyHeader + struct SCNotification { - struct NotifyHeader nmhdr; + struct Sci_NotifyHeader nmhdr; int position; /* SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND */ int ch; /* SCN_CHARADDED, SCN_KEY */ int modifiers; /* SCN_KEY */ @@ -823,26 +877,12 @@ int listType; /* SCN_USERLISTSELECTION */ int x; /* SCN_DWELLSTART, SCN_DWELLEND */ int y; /* SCN_DWELLSTART, SCN_DWELLEND */ + int token; /* SCN_MODIFIED with SC_MOD_CONTAINER */ + int annotationLinesAdded; /* SC_MOD_CHANGEANNOTATION */ }; #ifdef SCI_NAMESPACE } #endif -/* Deprecation section listing all API features that are deprecated and will - * will be removed completely in a future version. - * To enable these features define INCLUDE_DEPRECATED_FEATURES */ - -#ifdef INCLUDE_DEPRECATED_FEATURES - -#define SCI_SETCARETPOLICY 2369 -#define CARET_CENTER 0x02 -#define CARET_XEVEN 0x08 -#define CARET_XJUMPS 0x10 - -#define SCN_POSCHANGED 2012 -#define SCN_CHECKBRACE 2007 - -#endif - #endif diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/Scintilla.iface /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/Scintilla.iface --- geany-0.17/scintilla/include/Scintilla.iface 2009-01-18 18:18:38.000000000 +0000 +++ geany-0.18/scintilla/include/Scintilla.iface 2009-07-30 12:29:53.000000000 +0100 @@ -269,6 +269,8 @@ val SC_MARK_PIXMAP=25 val SC_MARK_FULLRECT=26 val SC_MARK_LEFTRECT=27 +val SC_MARK_AVAILABLE=28 +val SC_MARK_UNDERLINE=29 val SC_MARK_CHARACTER=10000 @@ -325,6 +327,8 @@ val SC_MARGIN_NUMBER=1 val SC_MARGIN_BACK=2 val SC_MARGIN_FORE=3 +val SC_MARGIN_TEXT=4 +val SC_MARGIN_RTEXT=5 # Set a margin to be either numeric or symbolic. set void SetMarginTypeN=2240(int margin, int marginType) @@ -1011,10 +1015,6 @@ val SC_FOLDLEVELBASE=0x400 val SC_FOLDLEVELWHITEFLAG=0x1000 val SC_FOLDLEVELHEADERFLAG=0x2000 -val SC_FOLDLEVELBOXHEADERFLAG=0x4000 -val SC_FOLDLEVELBOXFOOTERFLAG=0x8000 -val SC_FOLDLEVELCONTRACTED=0x10000 -val SC_FOLDLEVELUNINDENT=0x20000 val SC_FOLDLEVELNUMBERMASK=0x0FFF # Set the fold level of a line. @@ -1058,7 +1058,6 @@ val SC_FOLDFLAG_LINEAFTER_EXPANDED=0x0008 val SC_FOLDFLAG_LINEAFTER_CONTRACTED=0x0010 val SC_FOLDFLAG_LEVELNUMBERS=0x0040 -val SC_FOLDFLAG_BOX=0x0001 # Set some style options for folding. fun void SetFoldFlags=2233(int flags,) @@ -1132,6 +1131,17 @@ # Retrive the start indent for wrapped lines. get int GetWrapStartIndent=2465(,) +enu WrapIndentMode=SC_WRAPINDENT_ +val SC_WRAPINDENT_FIXED=0 +val SC_WRAPINDENT_SAME=1 +val SC_WRAPINDENT_INDENT=2 + +# Sets how wrapped sublines are placed. Default is fixed. +set void SetWrapIndentMode=2472(int mode,) + +# Retrieve how wrapped sublines are placed. Default is fixed. +get int GetWrapIndentMode=2473(,) + enu LineCache=SC_CACHE_ val SC_CACHE_NONE=0 val SC_CACHE_CARET=1 @@ -1478,6 +1488,11 @@ # Get internal focus flag. get bool GetFocus=2381(,) +enu Status=SC_STATUS_ +val SC_STATUS_OK=0 +val SC_STATUS_FAILURE=1 +val SC_STATUS_BADALLOC=2 + # Change error status - 0 = OK. set void SetStatus=2382(int statusCode,) # Get error status. @@ -1810,6 +1825,107 @@ # Are keys always interpreted as Unicode? get bool GetKeysUnicode=2522(,) +# Set the alpha fill colour of the given indicator. +set void IndicSetAlpha=2523(int indicator, int alpha) + +# Get the alpha fill colour of the given indicator. +get int IndicGetAlpha=2524(int indicator,) + +# Set extra ascent for each line +set void SetExtraAscent=2525(int extraAscent,) + +# Get extra ascent for each line +get int GetExtraAscent=2526(,) + +# Set extra descent for each line +set void SetExtraDescent=2527(int extraDescent,) + +# Get extra descent for each line +get int GetExtraDescent=2528(,) + +# Which symbol was defined for markerNumber with MarkerDefine +fun int MarkerSymbolDefined=2529(int markerNumber,) + +# Set the text in the text margin for a line +set void MarginSetText=2530(int line, string text) + +# Get the text in the text margin for a line +get int MarginGetText=2531(int line, stringresult text) + +# Set the style number for the text margin for a line +set void MarginSetStyle=2532(int line, int style) + +# Get the style number for the text margin for a line +get int MarginGetStyle=2533(int line,) + +# Set the style in the text margin for a line +set void MarginSetStyles=2534(int line, string styles) + +# Get the styles in the text margin for a line +get int MarginGetStyles=2535(int line, stringresult styles) + +# Clear the margin text on all lines +fun void MarginTextClearAll=2536(,) + +# Get the start of the range of style numbers used for margin text +set void MarginSetStyleOffset=2537(int style,) + +# Get the start of the range of style numbers used for margin text +get int MarginGetStyleOffset=2538(,) + +# Set the annotation text for a line +set void AnnotationSetText=2540(int line, string text) + +# Get the annotation text for a line +get int AnnotationGetText=2541(int line, stringresult text) + +# Set the style number for the annotations for a line +set void AnnotationSetStyle=2542(int line, int style) + +# Get the style number for the annotations for a line +get int AnnotationGetStyle=2543(int line,) + +# Set the annotation styles for a line +set void AnnotationSetStyles=2544(int line, string styles) + +# Get the annotation styles for a line +get int AnnotationGetStyles=2545(int line, stringresult styles) + +# Get the number of annotation lines for a line +get int AnnotationGetLines=2546(int line,) + +# Clear the annotations from all lines +fun void AnnotationClearAll=2547(,) + +enu AnnotationVisible=ANNOTATION_ +val ANNOTATION_HIDDEN=0 +val ANNOTATION_STANDARD=1 +val ANNOTATION_BOXED=2 + +# Set the visibility for the annotations for a view +set void AnnotationSetVisible=2548(int visible,) + +# Get the visibility for the annotations for a view +get int AnnotationGetVisible=2549(,) + +# Get the start of the range of style numbers used for annotations +set void AnnotationSetStyleOffset=2550(int style,) + +# Get the start of the range of style numbers used for annotations +get int AnnotationGetStyleOffset=2551(,) + +val UNDO_MAY_COALESCE=1 + +# Add a container action to the undo stack +fun void AddUndoAction=2560(int token, int flags) + +# Find the position of a character from a point within the window. +fun position CharPositionFromPoint=2561(int x, int y) + +# Find the position of a character from a point within the window. +# Return INVALID_POSITION if not close to text. +fun position CharPositionFromPointClose=2562(int x, int y) + # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) @@ -1875,7 +1991,10 @@ val SC_STARTACTION=0x2000 val SC_MOD_CHANGEINDICATOR=0x4000 val SC_MOD_CHANGELINESTATE=0x8000 -val SC_MODEVENTMASKALL=0xFFFF +val SC_MOD_CHANGEMARGIN=0x10000 +val SC_MOD_CHANGEANNOTATION=0x20000 +val SC_MOD_CONTAINER=0x40000 +val SC_MODEVENTMASKALL=0x7FFFF # For compatibility, these go through the COMMAND notification rather than NOTIFY # and should have had exactly the same values as the EN_* constants. @@ -2009,12 +2128,21 @@ val SCLEX_POWERSHELL=88 val SCLEX_MYSQL=89 val SCLEX_PO=90 +val SCLEX_TAL=91 +val SCLEX_COBOL=92 +val SCLEX_TACL=93 +val SCLEX_SORCUS=94 +val SCLEX_POWERPRO=95 +val SCLEX_NIMROD=96 +val SCLEX_SML=97 +val SCLEX_MARKDOWN=98 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. val SCLEX_AUTOMATIC=1000 # Lexical states for SCLEX_PYTHON lex Python=SCLEX_PYTHON SCE_P_ +lex Nimrod=SCLEX_NIMROD SCE_P_ val SCE_P_DEFAULT=0 val SCE_P_COMMENTLINE=1 val SCE_P_NUMBER=2 @@ -2033,7 +2161,6 @@ val SCE_P_DECORATOR=15 # Lexical states for SCLEX_CPP lex Cpp=SCLEX_CPP SCE_C_ -lex Pascal=SCLEX_PASCAL SCE_C_ lex BullAnt=SCLEX_BULLANT SCE_C_ val SCE_C_DEFAULT=0 val SCE_C_COMMENT=1 @@ -2075,6 +2202,11 @@ val SCE_D_COMMENTLINEDOC=15 val SCE_D_COMMENTDOCKEYWORD=16 val SCE_D_COMMENTDOCKEYWORDERROR=17 +val SCE_D_STRINGB=18 +val SCE_D_STRINGR=19 +val SCE_D_WORD5=20 +val SCE_D_WORD6=21 +val SCE_D_WORD7=22 # Lexical states for SCLEX_TCL lex TCL=SCLEX_TCL SCE_TCL_ val SCE_TCL_DEFAULT=0 @@ -2959,6 +3091,7 @@ val SCE_CAML_OPERATOR=7 val SCE_CAML_NUMBER=8 val SCE_CAML_CHAR=9 +val SCE_CAML_WHITE=10 val SCE_CAML_STRING=11 val SCE_CAML_COMMENT=12 val SCE_CAML_COMMENT1=13 @@ -3133,6 +3266,7 @@ 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 val SCE_INNO_KEYWORD_USER=9 @@ -3335,6 +3469,7 @@ val SCE_MYSQL_USER1=18 val SCE_MYSQL_USER2=19 val SCE_MYSQL_USER3=20 +val SCE_MYSQL_HIDDENCOMMAND=21 # Lexical state for SCLEX_PO lex Po=SCLEX_PO SCE_PO_ val SCE_PO_DEFAULT=0 @@ -3346,6 +3481,95 @@ val SCE_PO_MSGCTXT=6 val SCE_PO_MSGCTXT_TEXT=7 val SCE_PO_FUZZY=8 +# Lexical states for SCLEX_PASCAL +lex Pascal=SCLEX_PASCAL SCE_PAS_ +val SCE_PAS_DEFAULT=0 +val SCE_PAS_IDENTIFIER=1 +val SCE_PAS_COMMENT=2 +val SCE_PAS_COMMENT2=3 +val SCE_PAS_COMMENTLINE=4 +val SCE_PAS_PREPROCESSOR=5 +val SCE_PAS_PREPROCESSOR2=6 +val SCE_PAS_NUMBER=7 +val SCE_PAS_HEXNUMBER=8 +val SCE_PAS_WORD=9 +val SCE_PAS_STRING=10 +val SCE_PAS_STRINGEOL=11 +val SCE_PAS_CHARACTER=12 +val SCE_PAS_OPERATOR=13 +val SCE_PAS_ASM=14 +# Lexical state for SCLEX_SORCUS +lex SORCUS=SCLEX_SORCUS SCE_SORCUS_ +val SCE_SORCUS_DEFAULT=0 +val SCE_SORCUS_COMMAND=1 +val SCE_SORCUS_PARAMETER=2 +val SCE_SORCUS_COMMENTLINE=3 +val SCE_SORCUS_STRING=4 +val SCE_SORCUS_STRINGEOL=5 +val SCE_SORCUS_IDENTIFIER=6 +val SCE_SORCUS_OPERATOR=7 +val SCE_SORCUS_NUMBER=8 +val SCE_SORCUS_CONSTANT=9 +# Lexical state for SCLEX_POWERPRO +lex PowerPro=SCLEX_POWERPRO SCE_POWERPRO_ +val SCE_POWERPRO_DEFAULT=0 +val SCE_POWERPRO_COMMENTBLOCK=1 +val SCE_POWERPRO_COMMENTLINE=2 +val SCE_POWERPRO_NUMBER=3 +val SCE_POWERPRO_WORD=4 +val SCE_POWERPRO_WORD2=5 +val SCE_POWERPRO_WORD3=6 +val SCE_POWERPRO_WORD4=7 +val SCE_POWERPRO_DOUBLEQUOTEDSTRING=8 +val SCE_POWERPRO_SINGLEQUOTEDSTRING=9 +val SCE_POWERPRO_LINECONTINUE=10 +val SCE_POWERPRO_OPERATOR=11 +val SCE_POWERPRO_IDENTIFIER=12 +val SCE_POWERPRO_STRINGEOL=13 +val SCE_POWERPRO_VERBATIM=14 +val SCE_POWERPRO_ALTQUOTE=15 +val SCE_POWERPRO_FUNCTION=16 +# Lexical states for SCLEX_SML +lex SML=SCLEX_SML SCE_SML_ +val SCE_SML_DEFAULT=0 +val SCE_SML_IDENTIFIER=1 +val SCE_SML_TAGNAME=2 +val SCE_SML_KEYWORD=3 +val SCE_SML_KEYWORD2=4 +val SCE_SML_KEYWORD3=5 +val SCE_SML_LINENUM=6 +val SCE_SML_OPERATOR=7 +val SCE_SML_NUMBER=8 +val SCE_SML_CHAR=9 +val SCE_SML_STRING=11 +val SCE_SML_COMMENT=12 +val SCE_SML_COMMENT1=13 +val SCE_SML_COMMENT2=14 +val SCE_SML_COMMENT3=15 +# Lexical state for SCLEX_MARKDOWN +lex Markdown=SCLEX_MARKDOWN SCE_MARKDOWN_ +val SCE_MARKDOWN_DEFAULT=0 +val SCE_MARKDOWN_LINE_BEGIN=1 +val SCE_MARKDOWN_STRONG1=2 +val SCE_MARKDOWN_STRONG2=3 +val SCE_MARKDOWN_EM1=4 +val SCE_MARKDOWN_EM2=5 +val SCE_MARKDOWN_HEADER1=6 +val SCE_MARKDOWN_HEADER2=7 +val SCE_MARKDOWN_HEADER3=8 +val SCE_MARKDOWN_HEADER4=9 +val SCE_MARKDOWN_HEADER5=10 +val SCE_MARKDOWN_HEADER6=11 +val SCE_MARKDOWN_PRECHAR=12 +val SCE_MARKDOWN_ULIST_ITEM=13 +val SCE_MARKDOWN_OLIST_ITEM=14 +val SCE_MARKDOWN_BLOCKQUOTE=15 +val SCE_MARKDOWN_STRIKEOUT=16 +val SCE_MARKDOWN_HRULE=17 +val SCE_MARKDOWN_LINK=18 +val SCE_MARKDOWN_CODE=19 +val SCE_MARKDOWN_CODE2=20 +val SCE_MARKDOWN_CODEBK=21 # Events @@ -3375,19 +3599,4 @@ evt void IndicatorClick=2023(int modifiers, int position) evt void IndicatorRelease=2024(int modifiers, int position) evt void AutoCCancelled=2025(void) - -cat Deprecated - -# CARET_POLICY changed in 1.47 -fun void SetCaretPolicy=2369(int caretPolicy, int caretSlop) -val CARET_CENTER=0x02 -val CARET_XEVEN=0x08 -val CARET_XJUMPS=0x10 - -# The old name for SCN_UPDATEUI -val SCN_CHECKBRACE=2007 -evt void PosChanged=2012(int position) - -# SCLEX_HTML should be used in preference to these. -val SCLEX_ASP=29 -val SCLEX_PHP=30 +evt void AutoCCharDeleted=2026(void) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/SString.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/SString.h --- geany-0.17/scintilla/include/SString.h 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.18/scintilla/include/SString.h 2009-05-03 18:49:33.000000000 +0100 @@ -1,15 +1,15 @@ -/* SciTE - Scintilla based Text Editor */ +// SciTE - Scintilla based Text Editor /** @file SString.h ** A simple string class. **/ -/* Copyright 1998-2004 by Neil Hodgson - * The License.txt file describes the conditions under which this software may be distributed. */ +// Copyright 1998-2004 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. #ifndef SSTRING_H #define SSTRING_H -/* These functions are implemented because each platform calls them something different. */ +// 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); bool EqualCaseInsensitive(const char *a, const char *b); @@ -18,9 +18,9 @@ namespace Scintilla { #endif -/* Define another string class. - * While it would be 'better' to use std::string, that doubles the executable size. - * An SString may contain embedded nul characters. */ +// Define another string class. +// While it would be 'better' to use std::string, that doubles the executable size. +// An SString may contain embedded nul characters. /** * Base class from which the two other classes (SBuffer & SString) @@ -34,12 +34,12 @@ enum { measure_length=0xffffffffU}; protected: - char *s; /**< The C string */ - lenpos_t sSize; /**< The size of the buffer, less 1: ie. the maximum size of the string */ + char *s; ///< The C string + lenpos_t sSize; ///< The size of the buffer, less 1: ie. the maximum size of the string SContainer() : s(0), sSize(0) {} ~SContainer() { - delete []s; /* Suppose it was allocated using StringAllocate */ + delete []s; // Suppose it was allocated using StringAllocate s = 0; sSize = 0; } @@ -64,8 +64,8 @@ * @return the pointer to the new string */ static char *StringAllocate( - const char *s, /**< The string to duplicate */ - lenpos_t len=measure_length); /**< The length of memory to allocate. Optional. */ + const char *s, ///< The string to duplicate + lenpos_t len=measure_length); ///< The length of memory to allocate. Optional. }; @@ -92,14 +92,14 @@ } } private: - /** Copy constructor */ - /* Here only to be on the safe size, user should avoid returning SBuffer values. */ + /// Copy constructor + // Here only to be on the safe size, user should avoid returning SBuffer values. SBuffer(const SBuffer &source) : SContainer() { s = StringAllocate(source.s, source.sSize); sSize = (s) ? source.sSize : 0; } - /** Default assignment operator */ - /* Same here, shouldn't be used */ + /// Default assignment operator + // Same here, shouldn't be used SBuffer &operator=(const SBuffer &source) { if (this != &source) { delete []s; @@ -134,8 +134,8 @@ * functions to allow reliable manipulations of these strings, other than simple appends, etc. */ class SString : protected SContainer { - lenpos_t sLen; /**< The size of the string in s */ - lenpos_t sizeGrowth; /**< Minimum growth size when appending strings */ + lenpos_t sLen; ///< The size of the string in s + lenpos_t sizeGrowth; ///< Minimum growth size when appending strings enum { sizeGrowthDefault = 64 }; bool grow(lenpos_t lenNew); @@ -154,11 +154,11 @@ SString(SBuffer &buf) : sizeGrowth(sizeGrowthDefault) { s = buf.ptr(); sSize = sLen = buf.size(); - /* Consumes the given buffer! */ + // Consumes the given buffer! buf.reset(); } SString(const char *s_, lenpos_t first, lenpos_t last) : sizeGrowth(sizeGrowthDefault) { - /* note: expects the "last" argument to point one beyond the range end (a la STL iterators) */ + // note: expects the "last" argument to point one beyond the range end (a la STL iterators) s = StringAllocate(s_ + first, last - first); sSize = sLen = (s) ? last - first : 0; } @@ -246,7 +246,7 @@ void remove(lenpos_t pos, lenpos_t len); SString &change(lenpos_t pos, char ch) { - if (pos < sLen) { /* character changed must be in string bounds */ + if (pos < sLen) { // character changed must be in string bounds *(s + pos) = ch; } return *this; @@ -276,8 +276,8 @@ * @return the pointer to the new string */ inline char *StringDup( - const char *s, /**< The string to duplicate*/ - SContainer::lenpos_t len=SContainer::measure_length) /**< The length of memory to allocate. Optional.*/ + const char *s, ///< The string to duplicate + SContainer::lenpos_t len=SContainer::measure_length) ///< The length of memory to allocate. Optional. { return SContainer::StringAllocate(s, len); } diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/include/WindowAccessor.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/include/WindowAccessor.h --- geany-0.17/scintilla/include/WindowAccessor.h 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.18/scintilla/include/WindowAccessor.h 2009-05-03 18:49:33.000000000 +0100 @@ -1,10 +1,10 @@ -/* Scintilla source code edit control */ +// Scintilla source code edit control /** @file WindowAccessor.h ** Implementation of BufferAccess and StylingAccess on a Scintilla ** rapid easy access to contents of a Scintilla. **/ -/* Copyright 1998-2001 by Neil Hodgson - * The License.txt file describes the conditions under which this software may be distributed. */ +// Copyright 1998-2001 by Neil Hodgson +// The License.txt file describes the conditions under which this software may be distributed. #ifdef SCI_NAMESPACE namespace Scintilla { @@ -13,7 +13,7 @@ /** */ class WindowAccessor : public Accessor { - /* Private so WindowAccessor objects can not be copied */ + // Private so WindowAccessor objects can not be copied WindowAccessor(const WindowAccessor &source) : Accessor(), props(source.props) {} WindowAccessor &operator=(const WindowAccessor &) { return *this; } protected: @@ -30,8 +30,8 @@ bool InternalIsLeadByte(char ch); void Fill(int position); public: - WindowAccessor(WindowID id_, PropSet &props_) : - Accessor(), id(id_), props(props_), + WindowAccessor(WindowID id_, PropSet &props_) : + Accessor(), id(id_), props(props_), lenDoc(-1), validLen(0), chFlags(0), chWhile(0) { } ~WindowAccessor(); @@ -44,8 +44,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(); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/Indicator.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/Indicator.cxx --- geany-0.17/scintilla/Indicator.cxx 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.18/scintilla/Indicator.cxx 2009-05-03 18:49:33.000000000 +0100 @@ -72,7 +72,7 @@ rcBox.top = rcLine.top + 1; rcBox.left = rc.left; rcBox.right = rc.right; - surface->AlphaRectangle(rcBox, 1, fore.allocated, 30, fore.allocated, 50, 0); + surface->AlphaRectangle(rcBox, 1, fore.allocated, fillAlpha, fore.allocated, 50, 0); } else { // Either INDIC_PLAIN or unknown surface->MoveTo(rc.left, ymid); surface->LineTo(rc.right, ymid); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/Indicator.h /tmp/ssBwSf4GIv/geany-0.18/scintilla/Indicator.h --- geany-0.17/scintilla/Indicator.h 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.18/scintilla/Indicator.h 2009-05-03 18:49:33.000000000 +0100 @@ -19,7 +19,8 @@ int style; bool under; ColourPair fore; - Indicator() : style(INDIC_PLAIN), under(false), fore(ColourDesired(0,0,0)) { + int fillAlpha; + Indicator() : style(INDIC_PLAIN), under(false), fore(ColourDesired(0,0,0)), fillAlpha(30) { } void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine); }; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/KeyWords.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/KeyWords.cxx --- geany-0.17/scintilla/KeyWords.cxx 2009-01-18 18:18:38.000000000 +0000 +++ geany-0.18/scintilla/KeyWords.cxx 2009-07-30 12:29:53.000000000 +0100 @@ -144,7 +144,6 @@ LINK_LEXER(lmAda); LINK_LEXER(lmAsm); LINK_LEXER(lmBash); - LINK_LEXER(lmFreeBasic); LINK_LEXER(lmCaml); LINK_LEXER(lmCmake); LINK_LEXER(lmCPP); @@ -153,11 +152,13 @@ LINK_LEXER(lmDiff); LINK_LEXER(lmF77); LINK_LEXER(lmFortran); + LINK_LEXER(lmFreeBasic); LINK_LEXER(lmHaskell); LINK_LEXER(lmHTML); LINK_LEXER(lmLatex); LINK_LEXER(lmLua); LINK_LEXER(lmMake); + LINK_LEXER(lmMarkdown); LINK_LEXER(lmMatlab); LINK_LEXER(lmNsis); LINK_LEXER(lmNull); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/LexBash.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/LexBash.cxx --- geany-0.17/scintilla/LexBash.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/LexBash.cxx 2009-05-03 18:49:33.000000000 +0100 @@ -334,6 +334,10 @@ } char s[HERE_DELIM_MAX]; sc.GetCurrent(s, sizeof(s)); + if (sc.LengthCurrent() == 0) + break; + if (s[strlen(s) - 1] == '\r') + s[strlen(s) - 1] = '\0'; if (strcmp(HereDoc.Delimiter, s) == 0) { if ((prefixws > 0 && HereDoc.Indent) || // indentation rule (prefixws == 0 && !HereDoc.Indent)) { diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/LexCaml.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/LexCaml.cxx --- geany-0.17/scintilla/LexCaml.cxx 2007-06-18 14:02:34.000000000 +0100 +++ geany-0.18/scintilla/LexCaml.cxx 2009-07-04 10:19:36.000000000 +0100 @@ -2,7 +2,7 @@ /** @file LexCaml.cxx ** Lexer for Objective Caml. **/ -// Copyright 2005 by Robert Roessler +// Copyright 2005-2009 by Robert Roessler // The License.txt file describes the conditions under which this software may be distributed. /* Release History 20050204 Initial release. @@ -15,6 +15,7 @@ 20051125 Added 2nd "optional" keywords class. 20051129 Support "magic" (read-only) comments for RCaml. 20051204 Swtich to using StyleContext infrastructure. + 20090629 Add full Standard ML '97 support. */ #include @@ -35,7 +36,6 @@ // Since the Microsoft __iscsym[f] funcs are not ANSI... inline int iscaml(int c) {return isalnum(c) || c == '_';} inline int iscamlf(int c) {return isalpha(c) || c == '_';} -inline int iscamld(int c) {return isdigit(c) || c == '_';} static const int baseT[24] = { 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* A - L */ @@ -179,25 +179,27 @@ { // initialize styler StyleContext sc(startPos, length, initStyle, styler); - // set up [initial] state info (terminating states that shouldn't "bleed") - int nesting = 0; - if (sc.state < SCE_CAML_STRING) - sc.state = SCE_CAML_DEFAULT; - if (sc.state >= SCE_CAML_COMMENT) - nesting = (sc.state & 0x0f) - SCE_CAML_COMMENT; int chBase = 0, chToken = 0, chLit = 0; WordList& keywords = *keywordlists[0]; WordList& keywords2 = *keywordlists[1]; WordList& keywords3 = *keywordlists[2]; + const bool isSML = keywords.InList("andalso"); const int useMagic = styler.GetPropertyInt("lexer.caml.magic", 0); + // set up [initial] state info (terminating states that shouldn't "bleed") + const int state_ = sc.state & 0x0f; + if (state_ <= SCE_CAML_CHAR + || (isSML && state_ == SCE_CAML_STRING)) + sc.state = SCE_CAML_DEFAULT; + int nesting = (state_ >= SCE_CAML_COMMENT)? (state_ - SCE_CAML_COMMENT): 0; + // foreach char in range... while (sc.More()) { // set up [per-char] state info - int state2 = -1; // (ASSUME no state change) + int state2 = -1; // (ASSUME no state change) int chColor = sc.currentPos - 1;// (ASSUME standard coloring range) - bool advance = true; // (ASSUME scanner "eats" 1 char) + bool advance = true; // (ASSUME scanner "eats" 1 char) // step state machine switch (sc.state & 0x0f) { @@ -206,25 +208,38 @@ // it's wide open; what do we have? if (iscamlf(sc.ch)) state2 = SCE_CAML_IDENTIFIER; - else if (sc.Match('`') && iscamlf(sc.chNext)) + else if (!isSML && sc.Match('`') && iscamlf(sc.chNext)) state2 = SCE_CAML_TAGNAME; - else if (sc.Match('#') && isdigit(sc.chNext)) + else if (!isSML && sc.Match('#') && isdigit(sc.chNext)) state2 = SCE_CAML_LINENUM; else if (isdigit(sc.ch)) { + // it's a number, assume base 10 state2 = SCE_CAML_NUMBER, chBase = 10; - if (sc.Match('0') && strchr("bBoOxX", sc.chNext)) - chBase = baseT[tolower(sc.chNext) - 'a'], sc.Forward(); - } else if (sc.Match('\'')) /* (char literal?) */ + if (sc.Match('0')) { + // there MAY be a base specified... + const char* baseC = "bBoOxX"; + if (isSML) { + if (sc.chNext == 'w') + sc.Forward(); // (consume SML "word" indicator) + baseC = "x"; + } + // ... change to specified base AS REQUIRED + if (strchr(baseC, sc.chNext)) + chBase = baseT[tolower(sc.chNext) - 'a'], sc.Forward(); + } + } else if (!isSML && sc.Match('\'')) // (Caml char literal?) state2 = SCE_CAML_CHAR, chLit = 0; - else if (sc.Match('\"')) + else if (isSML && sc.Match('#', '"')) // (SML char literal?) + state2 = SCE_CAML_CHAR, sc.Forward(); + else if (sc.Match('"')) state2 = SCE_CAML_STRING; else if (sc.Match('(', '*')) - state2 = SCE_CAML_COMMENT, - sc.ch = ' ', // (make SURE "(*)" isn't seen as a closed comment) - sc.Forward(); - else if (strchr("!?~" /* Caml "prefix-symbol" */ - "=<>@^|&+-*/$%" /* Caml "infix-symbol" */ - "()[]{};,:.#", sc.ch)) /* Caml "bracket" or ;,:.# */ + state2 = SCE_CAML_COMMENT, sc.Forward(), sc.ch = ' '; // (*)... + else if (strchr("!?~" /* Caml "prefix-symbol" */ + "=<>@^|&+-*/$%" /* Caml "infix-symbol" */ + "()[]{};,:.#", sc.ch) // Caml "bracket" or ;,:.# + // SML "extra" ident chars + || (isSML && (sc.Match('\\') || sc.Match('`')))) state2 = SCE_CAML_OPERATOR; break; @@ -273,9 +288,12 @@ case SCE_CAML_OPERATOR: { // [try to] interpret as [additional] operator char const char* o = 0; - if (iscaml(sc.ch) || isspace(sc.ch) /* ident or whitespace */ - || (o = strchr(")]};,\'\"`#", sc.ch),o)/* "termination" chars */ - || !strchr("!$%&*+-./:<=>?@^|~", sc.ch)/* "operator" chars */) { + if (iscaml(sc.ch) || isspace(sc.ch) // ident or whitespace + || (o = strchr(")]};,\'\"#", sc.ch),o) // "termination" chars + || (!isSML && sc.Match('`')) // Caml extra term char + || (!strchr("!$%&*+-./:<=>?@^|~", sc.ch)// "operator" chars + // SML extra ident chars + && !(isSML && (sc.Match('\\') || sc.Match('`'))))) { // check for INCLUSIVE termination if (o && strchr(")]};,", sc.ch)) { if ((sc.Match(')') && sc.chPrev == '(') @@ -292,24 +310,27 @@ case SCE_CAML_NUMBER: // [try to] interpret as [additional] numeric literal char - // N.B. - improperly accepts "extra" digits in base 2 or 8 literals - if (iscamld(sc.ch) || IsADigit(sc.ch, chBase)) + if ((!isSML && sc.Match('_')) || IsADigit(sc.ch, chBase)) break; // how about an integer suffix? - if ((sc.Match('l') || sc.Match('L') || sc.Match('n')) - && (iscamld(sc.chPrev) || IsADigit(sc.chPrev, chBase))) + if (!isSML && (sc.Match('l') || sc.Match('L') || sc.Match('n')) + && (sc.chPrev == '_' || IsADigit(sc.chPrev, chBase))) break; // or a floating-point literal? if (chBase == 10) { // with a decimal point? - if (sc.Match('.') && iscamld(sc.chPrev)) + if (sc.Match('.') + && ((!isSML && sc.chPrev == '_') + || IsADigit(sc.chPrev, chBase))) break; // with an exponent? (I) if ((sc.Match('e') || sc.Match('E')) - && (iscamld(sc.chPrev) || sc.chPrev == '.')) + && ((!isSML && (sc.chPrev == '.' || sc.chPrev == '_')) + || IsADigit(sc.chPrev, chBase))) break; // with an exponent? (II) - if ((sc.Match('+') || sc.Match('-')) + if (((!isSML && (sc.Match('+') || sc.Match('-'))) + || (isSML && sc.Match('~'))) && (sc.chPrev == 'e' || sc.chPrev == 'E')) break; } @@ -318,29 +339,56 @@ break; case SCE_CAML_CHAR: - // [try to] interpret as [additional] char literal char - if (sc.Match('\\')) { - chLit = 1; // (definitely IS a char literal) - if (sc.chPrev == '\\') - sc.ch = ' '; // (so termination test isn't fooled) + if (!isSML) { + // [try to] interpret as [additional] char literal char + if (sc.Match('\\')) { + chLit = 1; // (definitely IS a char literal) + if (sc.chPrev == '\\') + sc.ch = ' '; // (...\\') + // should we be terminating - one way or another? + } else if ((sc.Match('\'') && sc.chPrev != '\\') + || sc.atLineEnd) { + state2 = SCE_CAML_DEFAULT; + if (sc.Match('\'')) + chColor++; + else + sc.ChangeState(SCE_CAML_IDENTIFIER); + // ... maybe a char literal, maybe not + } else if (chLit < 1 && sc.currentPos - chToken >= 2) + sc.ChangeState(SCE_CAML_IDENTIFIER), advance = false; + break; + }/* else + // fall through for SML char literal (handle like string) */ + + case SCE_CAML_STRING: + // [try to] interpret as [additional] [SML char/] string literal char + if (isSML && sc.Match('\\') && sc.chPrev != '\\' && isspace(sc.chNext)) + state2 = SCE_CAML_WHITE; + else if (sc.Match('\\') && sc.chPrev == '\\') + sc.ch = ' '; // (...\\") // should we be terminating - one way or another? - } else if ((sc.Match('\'') && sc.chPrev != '\\') || sc.atLineEnd) { + else if ((sc.Match('"') && sc.chPrev != '\\') + || (isSML && sc.atLineEnd)) { state2 = SCE_CAML_DEFAULT; - if (sc.Match('\'')) + if (sc.Match('"')) chColor++; - else - sc.ChangeState(SCE_CAML_IDENTIFIER); - // ... maybe a char literal, maybe not - } else if (chLit < 1 && sc.currentPos - chToken >= 2) - sc.ChangeState(SCE_CAML_IDENTIFIER), advance = false; + } break; - case SCE_CAML_STRING: - // [try to] interpret as [additional] string literal char - if (sc.Match('\\') && sc.chPrev == '\\') - sc.ch = ' '; // (so '\\' doesn't cause us trouble) - else if (sc.Match('\"') && sc.chPrev != '\\') - state2 = SCE_CAML_DEFAULT, chColor++; + case SCE_CAML_WHITE: + // [try to] interpret as [additional] SML embedded whitespace char + if (sc.Match('\\')) { + // style this puppy NOW... + state2 = SCE_CAML_STRING, sc.ch = ' ' /* (...\") */, chColor++, + styler.ColourTo(chColor, SCE_CAML_WHITE), styler.Flush(); + // ... then backtrack to determine original SML literal type + int p = chColor - 2; + for (; p >= 0 && styler.StyleAt(p) == SCE_CAML_WHITE; p--) ; + if (p >= 0) + state2 = static_cast(styler.StyleAt(p)); + // take care of state change NOW + sc.ChangeState(state2), state2 = -1; + } break; case SCE_CAML_COMMENT: @@ -350,8 +398,7 @@ // we're IN a comment - does this start a NESTED comment? if (sc.Match('(', '*')) state2 = sc.state + 1, chToken = sc.currentPos, - sc.ch = ' ', // (make SURE "(*)" isn't seen as a closed comment) - sc.Forward(), nesting++; + sc.Forward(), sc.ch = ' ' /* (*)... */, nesting++; // [try to] interpret as [additional] comment char else if (sc.Match(')') && sc.chPrev == '*') { if (nesting) @@ -366,7 +413,7 @@ break; } - // handle state change and char coloring as required + // handle state change and char coloring AS REQUIRED if (state2 >= 0) styler.ColourTo(chColor, sc.state), sc.ChangeState(state2); // move to next char UNLESS re-scanning current char diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/LexCPP.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/LexCPP.cxx --- geany-0.17/scintilla/LexCPP.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/LexCPP.cxx 2009-07-04 10:19:36.000000000 +0100 @@ -58,6 +58,9 @@ WordList &keywords3 = *keywordlists[2]; 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). bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0; CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-"); @@ -67,6 +70,9 @@ CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true); CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); + + // property lexer.cpp.allow.dollars + // 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('$'); @@ -77,6 +83,7 @@ bool lastWordWasUUID = false; int styleBeforeDCKeyword = SCE_C_DEFAULT; bool continuationLine = false; + bool isIncludePreprocessor = false; if (initStyle == SCE_C_PREPROCESSOR) { // Set continuationLine if last character of previous line is '\' @@ -118,6 +125,7 @@ // if different sets of lines lexed. visibleChars = 0; lastWordWasUUID = false; + isIncludePreprocessor = false; } // Handle line continuation generically. @@ -230,6 +238,11 @@ case SCE_C_STRING: if (sc.atLineEnd) { sc.ChangeState(SCE_C_STRINGEOL); + } else if (isIncludePreprocessor) { + if (sc.ch == '>') { + sc.ForwardSetState(SCE_C_DEFAULT); + isIncludePreprocessor = false; + } } else if (sc.ch == '\\') { if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { sc.Forward(); @@ -321,6 +334,9 @@ sc.SetState(SCE_C_REGEX); // JavaScript's RegEx } else if (sc.ch == '\"') { sc.SetState(SCE_C_STRING); + isIncludePreprocessor = false; // ensure that '>' won't end the string + } else if (isIncludePreprocessor && sc.ch == '<') { + sc.SetState(SCE_C_STRING); } else if (sc.ch == '\'') { sc.SetState(SCE_C_CHARACTER); } else if (sc.ch == '#' && visibleChars == 0) { @@ -332,6 +348,8 @@ } while ((sc.ch == ' ' || sc.ch == '\t') && sc.More()); if (sc.atLineEnd) { sc.SetState(SCE_C_DEFAULT); + } else if (sc.Match("include")) { + isIncludePreprocessor = true; } } else if (isoperator(static_cast(sc.ch))) { sc.SetState(SCE_C_OPERATOR); @@ -359,10 +377,24 @@ // and to make it possible to fiddle the current level for "} else {". static void FoldCppDoc(unsigned int startPos, int length, int initStyle, 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. 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. 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. bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; + unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); @@ -442,6 +474,10 @@ lineCurrent++; levelCurrent = levelNext; levelMinCurrent = levelCurrent; + if (atEOL && (i == static_cast(styler.Length()-1))) { + // There is an empty line at end of file so give it same level and empty + styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG); + } visibleChars = 0; } } diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/LexD.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/LexD.cxx --- geany-0.17/scintilla/LexD.cxx 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.18/scintilla/LexD.cxx 2009-07-04 10:19:36.000000000 +0100 @@ -25,20 +25,20 @@ using namespace Scintilla; #endif -/*/ Nested comments require keeping the value of the nesting level for every - position in the document. But since scintilla always styles line by line, - we only need to store one value per line. The non-negative number indicates - nesting level at the end of the line. -/*/ +/* Nested comments require keeping the value of the nesting level for every + position in the document. But since scintilla always styles line by line, + we only need to store one value per line. The non-negative number indicates + nesting level at the end of the line. +*/ -// We use custom qualifiers since it is not clear what D allows. +// Underscore, letter, digit and universal alphas from C99 Appendix D. static bool IsWordStart(int ch) { - return isascii(ch) && (isalpha(ch) || ch == '_'); + return (isascii(ch) && (isalpha(ch) || ch == '_')) || !isascii(ch); } static bool IsWord(int ch) { - return isascii(ch) && (isalnum(ch) || ch == '_'); + return (isascii(ch) && (isalnum(ch) || ch == '_')) || !isascii(ch); } static bool IsDoxygen(int ch) { @@ -51,308 +51,349 @@ return false; } +static bool IsStringSuffix(int ch) { + return ch == 'c' || ch == 'w' || ch == 'd'; +} + -static void ColouriseDoc(unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler, bool caseSensitive) { +static void ColouriseDoc(unsigned int startPos, int length, int initStyle, + WordList *keywordlists[], Accessor &styler, bool caseSensitive) { - WordList &keywords = *keywordlists[0]; - WordList &keywords2 = *keywordlists[1]; - WordList &keywords3 = *keywordlists[2]; - WordList &keywords4 = *keywordlists[3]; - - int styleBeforeDCKeyword = SCE_D_DEFAULT; - - StyleContext sc(startPos, length, initStyle, styler); - - int curLine = styler.GetLine(startPos); - int curNcLevel = curLine > 0? styler.GetLineState(curLine-1): 0; - - for (; sc.More(); sc.Forward()) { - - if (sc.atLineStart) { - if (sc.state == SCE_D_STRING) { - // Prevent SCE_D_STRINGEOL from leaking back to previous line which - // ends with a line continuation by locking in the state upto this position. - sc.SetState(SCE_D_STRING); - } - curLine = styler.GetLine(sc.currentPos); - styler.SetLineState(curLine, curNcLevel); - } - - // 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. - switch (sc.state) { - case SCE_D_OPERATOR: - sc.SetState(SCE_D_DEFAULT); - break; - case SCE_D_NUMBER: - // We accept almost anything because of hex. and number suffixes - if (!IsWord(sc.ch) && sc.ch != '.') { - sc.SetState(SCE_D_DEFAULT); - } - break; - case SCE_D_IDENTIFIER: - if (!IsWord(sc.ch)) { - char s[1000]; - if (caseSensitive) { - sc.GetCurrent(s, sizeof(s)); - } else { - sc.GetCurrentLowered(s, sizeof(s)); - } - if (keywords.InList(s)) { - sc.ChangeState(SCE_D_WORD); - } else if (keywords2.InList(s)) { - sc.ChangeState(SCE_D_WORD2); - } else if (keywords4.InList(s)) { - sc.ChangeState(SCE_D_TYPEDEF); - } - sc.SetState(SCE_D_DEFAULT); - } - break; - case SCE_D_COMMENT: - if (sc.Match('*', '/')) { - sc.Forward(); - sc.ForwardSetState(SCE_D_DEFAULT); - } - break; - case SCE_D_COMMENTDOC: - if (sc.Match('*', '/')) { - sc.Forward(); - sc.ForwardSetState(SCE_D_DEFAULT); - } else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support - // Verify that we have the conditions to mark a comment-doc-keyword - if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) { - styleBeforeDCKeyword = SCE_D_COMMENTDOC; - sc.SetState(SCE_D_COMMENTDOCKEYWORD); - } - } - break; - case SCE_D_COMMENTLINE: - if (sc.atLineStart) { - sc.SetState(SCE_D_DEFAULT); - } - break; - case SCE_D_COMMENTLINEDOC: - if (sc.atLineStart) { - sc.SetState(SCE_D_DEFAULT); - } else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support - // Verify that we have the conditions to mark a comment-doc-keyword - if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) { - styleBeforeDCKeyword = SCE_D_COMMENTLINEDOC; - sc.SetState(SCE_D_COMMENTDOCKEYWORD); - } - } - break; - case SCE_D_COMMENTDOCKEYWORD: - if ((styleBeforeDCKeyword == SCE_D_COMMENTDOC) && sc.Match('*', '/')) { - sc.ChangeState(SCE_D_COMMENTDOCKEYWORDERROR); - sc.Forward(); - sc.ForwardSetState(SCE_D_DEFAULT); - } else if (!IsDoxygen(sc.ch)) { - char s[100]; - if (caseSensitive) { - sc.GetCurrent(s, sizeof(s)); - } else { - sc.GetCurrentLowered(s, sizeof(s)); - } - if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) { - sc.ChangeState(SCE_D_COMMENTDOCKEYWORDERROR); - } - sc.SetState(styleBeforeDCKeyword); - } - break; - case SCE_D_COMMENTNESTED: - if (sc.Match('+', '/')) { - if (curNcLevel > 0) - curNcLevel -= 1; - curLine = styler.GetLine(sc.currentPos); - styler.SetLineState(curLine, curNcLevel); - sc.Forward(); - if (curNcLevel == 0) { - sc.ForwardSetState(SCE_D_DEFAULT); - } - } - else if (sc.Match('/','+')) { - curNcLevel += 1; - curLine = styler.GetLine(sc.currentPos); - styler.SetLineState(curLine, curNcLevel); - sc.Forward(); - } - break; - case SCE_D_STRING: - if (sc.atLineEnd) { - sc.ChangeState(SCE_D_STRINGEOL); - } else if (sc.ch == '\\') { - if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { - sc.Forward(); - } - } else if (sc.ch == '\"') { - sc.ForwardSetState(SCE_D_DEFAULT); - } - break; - case SCE_D_CHARACTER: - if (sc.atLineEnd) { - sc.ChangeState(SCE_D_STRINGEOL); - } else if (sc.ch == '\\') { - if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') { - sc.Forward(); - } - } else if (sc.ch == '\'') { - sc.ForwardSetState(SCE_D_DEFAULT); - } - break; - case SCE_D_STRINGEOL: - if (sc.atLineStart) { - sc.SetState(SCE_D_DEFAULT); - } - break; - } - - // Determine if a new state should be entered. - if (sc.state == SCE_D_DEFAULT) { - if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { - sc.SetState(SCE_D_NUMBER); - } else if (IsWordStart(sc.ch)) { - sc.SetState(SCE_D_IDENTIFIER); - } else if (sc.Match('/','+')) { - curNcLevel += 1; - curLine = styler.GetLine(sc.currentPos); - styler.SetLineState(curLine, curNcLevel); - sc.SetState(SCE_D_COMMENTNESTED); - sc.Forward(); - } else if (sc.Match('/', '*')) { - if (sc.Match("/**") || sc.Match("/*!")) { // Support of Qt/Doxygen doc. style - sc.SetState(SCE_D_COMMENTDOC); - } else { - sc.SetState(SCE_D_COMMENT); - } - sc.Forward(); // Eat the * so it isn't used for the end of the comment - } else if (sc.Match('/', '/')) { - if ((sc.Match("///") && !sc.Match("////")) || sc.Match("//!")) - // Support of Qt/Doxygen doc. style - sc.SetState(SCE_D_COMMENTLINEDOC); - else - sc.SetState(SCE_D_COMMENTLINE); - } else if (sc.ch == '\"') { - sc.SetState(SCE_D_STRING); - } else if (sc.ch == '\'') { - sc.SetState(SCE_D_CHARACTER); - } else if (isoperator(static_cast(sc.ch))) { - sc.SetState(SCE_D_OPERATOR); - } - } - } - sc.Complete(); + WordList &keywords = *keywordlists[0]; + WordList &keywords2 = *keywordlists[1]; + WordList &keywords3 = *keywordlists[2]; //doxygen + WordList &keywords4 = *keywordlists[3]; + WordList &keywords5 = *keywordlists[4]; + WordList &keywords6 = *keywordlists[5]; + WordList &keywords7 = *keywordlists[6]; + + int styleBeforeDCKeyword = SCE_D_DEFAULT; + + StyleContext sc(startPos, length, initStyle, styler); + + int curLine = styler.GetLine(startPos); + int curNcLevel = curLine > 0? styler.GetLineState(curLine-1): 0; + bool numFloat = false; // Float literals have '+' and '-' signs + bool numHex = false; + + for (; sc.More(); sc.Forward()) { + + if (sc.atLineStart) { + curLine = styler.GetLine(sc.currentPos); + styler.SetLineState(curLine, curNcLevel); + } + + // Determine if the current state should terminate. + switch (sc.state) { + case SCE_D_OPERATOR: + sc.SetState(SCE_D_DEFAULT); + break; + case SCE_D_NUMBER: + // We accept almost anything because of hex. and number suffixes + if (isascii(sc.ch) && (isalnum(sc.ch) || sc.ch == '_')) { + continue; + } else if (sc.ch == '.' && sc.chNext != '.' && !numFloat) { + // Don't parse 0..2 as number. + numFloat=true; + continue; + } else if ( ( sc.ch == '-' || sc.ch == '+' ) && ( /*sign and*/ + ( !numHex && ( sc.chPrev == 'e' || sc.chPrev == 'E' ) ) || /*decimal or*/ + ( sc.chPrev == 'p' || sc.chPrev == 'P' ) ) ) { /*hex*/ + // Parse exponent sign in float literals: 2e+10 0x2e+10 + continue; + } else { + sc.SetState(SCE_D_DEFAULT); + } + break; + case SCE_D_IDENTIFIER: + if (!IsWord(sc.ch)) { + char s[1000]; + if (caseSensitive) { + sc.GetCurrent(s, sizeof(s)); + } else { + sc.GetCurrentLowered(s, sizeof(s)); + } + if (keywords.InList(s)) { + sc.ChangeState(SCE_D_WORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(SCE_D_WORD2); + } else if (keywords4.InList(s)) { + sc.ChangeState(SCE_D_TYPEDEF); + } else if (keywords5.InList(s)) { + sc.ChangeState(SCE_D_WORD5); + } else if (keywords6.InList(s)) { + sc.ChangeState(SCE_D_WORD6); + } else if (keywords7.InList(s)) { + sc.ChangeState(SCE_D_WORD7); + } + sc.SetState(SCE_D_DEFAULT); + } + break; + case SCE_D_COMMENT: + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_D_DEFAULT); + } + break; + case SCE_D_COMMENTDOC: + if (sc.Match('*', '/')) { + sc.Forward(); + sc.ForwardSetState(SCE_D_DEFAULT); + } else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support + // Verify that we have the conditions to mark a comment-doc-keyword + if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) { + styleBeforeDCKeyword = SCE_D_COMMENTDOC; + sc.SetState(SCE_D_COMMENTDOCKEYWORD); + } + } + break; + case SCE_D_COMMENTLINE: + if (sc.atLineStart) { + sc.SetState(SCE_D_DEFAULT); + } + break; + case SCE_D_COMMENTLINEDOC: + if (sc.atLineStart) { + sc.SetState(SCE_D_DEFAULT); + } else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support + // Verify that we have the conditions to mark a comment-doc-keyword + if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) { + styleBeforeDCKeyword = SCE_D_COMMENTLINEDOC; + sc.SetState(SCE_D_COMMENTDOCKEYWORD); + } + } + break; + case SCE_D_COMMENTDOCKEYWORD: + if ((styleBeforeDCKeyword == SCE_D_COMMENTDOC) && sc.Match('*', '/')) { + sc.ChangeState(SCE_D_COMMENTDOCKEYWORDERROR); + sc.Forward(); + sc.ForwardSetState(SCE_D_DEFAULT); + } else if (!IsDoxygen(sc.ch)) { + char s[100]; + if (caseSensitive) { + sc.GetCurrent(s, sizeof(s)); + } else { + sc.GetCurrentLowered(s, sizeof(s)); + } + if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) { + sc.ChangeState(SCE_D_COMMENTDOCKEYWORDERROR); + } + sc.SetState(styleBeforeDCKeyword); + } + break; + case SCE_D_COMMENTNESTED: + if (sc.Match('+', '/')) { + if (curNcLevel > 0) + curNcLevel -= 1; + curLine = styler.GetLine(sc.currentPos); + styler.SetLineState(curLine, curNcLevel); + sc.Forward(); + if (curNcLevel == 0) { + sc.ForwardSetState(SCE_D_DEFAULT); + } + } else if (sc.Match('/','+')) { + curNcLevel += 1; + curLine = styler.GetLine(sc.currentPos); + styler.SetLineState(curLine, curNcLevel); + sc.Forward(); + } + break; + case SCE_D_STRING: + if (sc.ch == '\\') { + if (sc.chNext == '"' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '"') { + if(IsStringSuffix(sc.chNext)) + sc.Forward(); + sc.ForwardSetState(SCE_D_DEFAULT); + } + break; + case SCE_D_CHARACTER: + if (sc.atLineEnd) { + sc.ChangeState(SCE_D_STRINGEOL); + } else if (sc.ch == '\\') { + if (sc.chNext == '\'' || sc.chNext == '\\') { + sc.Forward(); + } + } else if (sc.ch == '\'') { + // Char has no suffixes + sc.ForwardSetState(SCE_D_DEFAULT); + } + break; + case SCE_D_STRINGEOL: + if (sc.atLineStart) { + sc.SetState(SCE_D_DEFAULT); + } + break; + case SCE_D_STRINGB: + if (sc.ch == '`') { + if(IsStringSuffix(sc.chNext)) + sc.Forward(); + sc.ForwardSetState(SCE_D_DEFAULT); + } + break; + case SCE_D_STRINGR: + if (sc.ch == '"') { + if(IsStringSuffix(sc.chNext)) + sc.Forward(); + sc.ForwardSetState(SCE_D_DEFAULT); + } + break; + } + + // Determine if a new state should be entered. + if (sc.state == SCE_D_DEFAULT) { + if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + sc.SetState(SCE_D_NUMBER); + numFloat = sc.ch == '.'; + // Remember hex literal + numHex = sc.ch == '0' && ( sc.chNext == 'x' || sc.chNext == 'X' ); + } else if ( (sc.ch == 'r' || sc.ch == 'x' || sc.ch == 'q') + && sc.chNext == '"' ) { + // Limited support for hex and delimited strings: parse as r"" + sc.SetState(SCE_D_STRINGR); + sc.Forward(); + } else if (IsWordStart(sc.ch) || sc.ch == '$') { + sc.SetState(SCE_D_IDENTIFIER); + } else if (sc.Match('/','+')) { + curNcLevel += 1; + curLine = styler.GetLine(sc.currentPos); + styler.SetLineState(curLine, curNcLevel); + sc.SetState(SCE_D_COMMENTNESTED); + sc.Forward(); + } else if (sc.Match('/', '*')) { + if (sc.Match("/**") || sc.Match("/*!")) { // Support of Qt/Doxygen doc. style + sc.SetState(SCE_D_COMMENTDOC); + } else { + sc.SetState(SCE_D_COMMENT); + } + sc.Forward(); // Eat the * so it isn't used for the end of the comment + } else if (sc.Match('/', '/')) { + if ((sc.Match("///") && !sc.Match("////")) || sc.Match("//!")) + // Support of Qt/Doxygen doc. style + sc.SetState(SCE_D_COMMENTLINEDOC); + else + sc.SetState(SCE_D_COMMENTLINE); + } else if (sc.ch == '"') { + sc.SetState(SCE_D_STRING); + } else if (sc.ch == '\'') { + sc.SetState(SCE_D_CHARACTER); + } else if (sc.ch == '`') { + sc.SetState(SCE_D_STRINGB); + } else if (isoperator(static_cast(sc.ch))) { + sc.SetState(SCE_D_OPERATOR); + if (sc.ch == '.' && sc.chNext == '.') sc.Forward(); // Range operator + } + } + } + sc.Complete(); } static bool IsStreamCommentStyle(int style) { - return style == SCE_D_COMMENT || - style == SCE_D_COMMENTDOC || - style == SCE_D_COMMENTDOCKEYWORD || - style == SCE_D_COMMENTDOCKEYWORDERROR; + return style == SCE_D_COMMENT || + style == SCE_D_COMMENTDOC || + style == SCE_D_COMMENTDOCKEYWORD || + style == SCE_D_COMMENTDOCKEYWORDERROR; } // 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 FoldDoc(unsigned int startPos, int length, int initStyle, Accessor &styler) { - bool foldComment = styler.GetPropertyInt("fold.comment") != 0; - bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; - bool foldAtElse = styler.GetPropertyInt("lexer.d.fold.at.else", + bool foldComment = styler.GetPropertyInt("fold.comment") != 0; + bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + + // property lexer.d.fold.at.else + // This option enables D folding on a "} else {" line of an if statement. + bool foldAtElse = styler.GetPropertyInt("lexer.d.fold.at.else", styler.GetPropertyInt("fold.at.else", 0)) != 0; - 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 (style == SCE_D_OPERATOR) { - if (ch == '{') { - // Measure the minimum before a '{' to allow - // folding on "} else {" - if (levelMinCurrent > levelNext) { - levelMinCurrent = levelNext; - } - levelNext++; - } else if (ch == '}') { - levelNext--; - } - } - if (atEOL) { - if (foldComment) { // Handle nested comments - int nc; - nc = styler.GetLineState(lineCurrent); - nc -= lineCurrent>0? styler.GetLineState(lineCurrent-1): 0; - levelNext += nc; - } - 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 (!IsASpace(ch)) - visibleChars++; - } + 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 (style == SCE_D_OPERATOR) { + if (ch == '{') { + // Measure the minimum before a '{' to allow + // folding on "} else {" + if (levelMinCurrent > levelNext) { + levelMinCurrent = levelNext; + } + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } + if (atEOL) { + if (foldComment) { // Handle nested comments + int nc; + nc = styler.GetLineState(lineCurrent); + nc -= lineCurrent>0? styler.GetLineState(lineCurrent-1): 0; + levelNext += nc; + } + 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 (!IsASpace(ch)) + visibleChars++; + } } static void FoldDDoc(unsigned int startPos, int length, int initStyle, - WordList *[], Accessor &styler) { - FoldDoc(startPos, length, initStyle, styler); + WordList *[], Accessor &styler) { + FoldDoc(startPos, length, initStyle, styler); } static const char * const dWordLists[] = { - "Primary keywords and identifiers", - "Secondary keywords and identifiers", - "Documentation comment keywords", - "Type definitions and aliases", - 0, - }; - -static void ColouriseDDoc(unsigned int startPos, int length, - int initStyle, WordList *keywordlists[], Accessor &styler) { - ColouriseDoc(startPos, length, initStyle, keywordlists, styler, true); + "Primary keywords and identifiers", + "Secondary keywords and identifiers", + "Documentation comment keywords", + "Type definitions and aliases", + "Keywords 5", + "Keywords 6", + "Keywords 7", + 0, + }; + +static void ColouriseDDoc(unsigned int startPos, int length, + int initStyle, WordList *keywordlists[], Accessor &styler) { + ColouriseDoc(startPos, length, initStyle, keywordlists, styler, true); } LexerModule lmD(SCLEX_D, ColouriseDDoc, "d", FoldDDoc, dWordLists); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/LexFortran.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/LexFortran.cxx --- geany-0.17/scintilla/LexFortran.cxx 2008-10-18 11:56:10.000000000 +0100 +++ geany-0.18/scintilla/LexFortran.cxx 2009-05-03 18:49:33.000000000 +0100 @@ -83,7 +83,7 @@ // Handle the fix format generically int toLineStart = sc.currentPos - posLineStart; if (isFixFormat && (toLineStart < 6 || toLineStart > 72)) { - if (toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*') || sc.ch == '!') { + if ((toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*')) || sc.ch == '!') { if (sc.MatchIgnoreCase("cdec$") || sc.MatchIgnoreCase("*dec$") || sc.MatchIgnoreCase("!dec$") || sc.MatchIgnoreCase("cdir$") || sc.MatchIgnoreCase("*dir$") || sc.MatchIgnoreCase("!dir$") || sc.MatchIgnoreCase("cms$") || sc.MatchIgnoreCase("*ms$") || sc.MatchIgnoreCase("!ms$") || @@ -252,7 +252,7 @@ lev = 0; else lev = 1; - } else if (strcmp(s, "end") == 0 && chNextNonBlank != '=' + } else if ((strcmp(s, "end") == 0 && chNextNonBlank != '=') || strcmp(s, "endassociate") == 0 || strcmp(s, "endblock") == 0 || strcmp(s, "endblockdata") == 0 || strcmp(s, "endselect") == 0 || strcmp(s, "enddo") == 0 || strcmp(s, "endenum") ==0 diff -Nru /tmp/H5qKeNSrz8/geany-0.17/scintilla/LexHTML.cxx /tmp/ssBwSf4GIv/geany-0.18/scintilla/LexHTML.cxx --- geany-0.17/scintilla/LexHTML.cxx 2009-02-15 10:55:58.000000000 +0000 +++ geany-0.18/scintilla/LexHTML.cxx 2009-07-04 10:19:36.000000000 +0100 @@ -274,17 +274,30 @@ s[i] = '\0'; // No keywords -> all are known - // Name of a closing tag starts at s + 1 char chAttr = SCE_H_TAGUNKNOWN; if (s[0] == '!') { chAttr = SCE_H_SGML_DEFAULT; - } else if (!keywords || keywords.InList(s[0] == '/' ? s + 1 : s)) { + } else if (!keywords || keywords.InList(s)) { chAttr = SCE_H_TAG; } styler.ColourTo(end, chAttr); if (chAttr == SCE_H_TAG) { if (allowScripts && 0 == strcmp(s, "script")) { - chAttr = SCE_H_SCRIPT; + // check to see if this is a self-closing tag by sniffing ahead + bool isSelfClose = false; + for (unsigned int cPos = end; cPos <= end + 100; cPos++) { + char ch = styler.SafeGetCharAt(cPos, '\0'); + if (ch == '\0' || ch == '>') + break; + else if (ch == '/' && styler.SafeGetCharAt(cPos + 1, '\0') == '>') { + isSelfClose = true; + break; + } + } + + // do not enter a script state if the tag self-closed + if (!isSelfClose) + chAttr = SCE_H_SCRIPT; } else if (!isXml && 0 == strcmp(s, "comment")) { chAttr = SCE_H_COMMENT; } @@ -561,6 +574,10 @@ } else { // 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. + // To change this to VBScript set asp.default.language to 2. Python is 3. lineState |= styler.GetPropertyInt("asp.default.language", eScriptJS) << 4; } script_mode inScriptType = script_mode((lineState >> 0) & 0x03); // 2 bits of scripting mode @@ -577,13 +594,37 @@ scriptLanguage = eScriptComment; } + // 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. + // 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. 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. 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. const bool caseSensitive = styler.GetPropertyInt("html.tags.case.sensitive", 0) != 0; + + // property lexer.xml.allow.scripts + // Set to 0 to disable scripts in XML. const bool allowScripts = styler.GetPropertyInt("lexer.xml.allow.scripts", 1) != 0; const CharacterSet setHTMLWord(CharacterSet::setAlphaNum, ".-_:!#", 0x80, true); @@ -1091,7 +1132,10 @@ } if (ch != '#' && !(isascii(ch) && isalnum(ch)) // Should check that '#' follows '&', but it is unlikely anyway... && ch != '.' && ch != '-' && ch != '_' && ch != ':') { // valid in XML - styler.ColourTo(i, SCE_H_TAGUNKNOWN); + if (!isascii(ch)) // Possibly start of a multibyte character so don't allow this byte to be in entity style + styler.ColourTo(i-1, SCE_H_TAGUNKNOWN); + else + styler.ColourTo(i, SCE_H_TAGUNKNOWN); state = SCE_H_DEFAULT; } break; @@ -1856,299 +1900,6 @@ ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists, styler, false); } -static bool isASPScript(int state) { - return - (state >= SCE_HJA_START && state <= SCE_HJA_REGEX) || - (state >= SCE_HBA_START && state <= SCE_HBA_STRINGEOL) || - (state >= SCE_HPA_DEFAULT && state <= SCE_HPA_IDENTIFIER); -} - -static void ColouriseHBAPiece(StyleContext &sc, WordList *keywordlists[]) { - WordList &keywordsVBS = *keywordlists[2]; - if (sc.state == SCE_HBA_WORD) { - if (!IsAWordChar(sc.ch)) { - char s[100]; - sc.GetCurrentLowered(s, sizeof(s)); - if (keywordsVBS.InList(s)) { - if (strcmp(s, "rem") == 0) { - sc.ChangeState(SCE_HBA_COMMENTLINE); - if (sc.atLineEnd) { - sc.SetState(SCE_HBA_DEFAULT); - } - } else { - sc.SetState(SCE_HBA_DEFAULT); - } - } else { - sc.ChangeState(SCE_HBA_IDENTIFIER); - sc.SetState(SCE_HBA_DEFAULT); - } - } - } else if (sc.state == SCE_HBA_NUMBER) { - if (!IsAWordChar(sc.ch)) { - sc.SetState(SCE_HBA_DEFAULT); - } - } else if (sc.state == SCE_HBA_STRING) { - if (sc.ch == '\"') { - sc.ForwardSetState(SCE_HBA_DEFAULT); - } else if (sc.ch == '\r' || sc.ch == '\n') { - sc.ChangeState(SCE_HBA_STRINGEOL); - sc.ForwardSetState(SCE_HBA_DEFAULT); - } - } else if (sc.state == SCE_HBA_COMMENTLINE) { - if (sc.ch == '\r' || sc.ch == '\n') { - sc.SetState(SCE_HBA_DEFAULT); - } - } - - if (sc.state == SCE_HBA_DEFAULT) { - if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { - sc.SetState(SCE_HBA_NUMBER); - } else if (IsAWordStart(sc.ch)) { - sc.SetState(SCE_HBA_WORD); - } else if (sc.ch == '\'') { - sc.SetState(SCE_HBA_COMMENTLINE); - } else if (sc.ch == '\"') { - sc.SetState(SCE_HBA_STRING); - } - } -} - -static void ColouriseHTMLPiece(StyleContext &sc, WordList *keywordlists[]) { - WordList &keywordsTags = *keywordlists[0]; - if (sc.state == SCE_H_COMMENT) { - if (sc.Match("-->")) { - sc.Forward(); - sc.Forward(); - sc.ForwardSetState(SCE_H_DEFAULT); - } - } else if (sc.state == SCE_H_ENTITY) { - if (sc.ch == ';') { - sc.ForwardSetState(SCE_H_DEFAULT); - } else if (sc.ch != '#' && (sc.ch < 0x80) && !isalnum(sc.ch) // Should check that '#' follows '&', but it is unlikely anyway... - && sc.ch != '.' && sc.ch != '-' && sc.ch != '_' && sc.ch != ':') { // valid in XML - sc.ChangeState(SCE_H_TAGUNKNOWN); - sc.SetState(SCE_H_DEFAULT); - } - } else if (sc.state == SCE_H_TAGUNKNOWN) { - if (!ishtmlwordchar(sc.ch) && !((sc.ch == '/') && (sc.chPrev == '<')) && sc.ch != '[') { - char s[100]; - sc.GetCurrentLowered(s, sizeof(s)); - if (s[1] == '/') { - if (keywordsTags.InList(s + 2)) { - sc.ChangeState(SCE_H_TAG); - } - } else { - if (keywordsTags.InList(s + 1)) { - sc.ChangeState(SCE_H_TAG); - } - } - if (sc.ch == '>') { - sc.ForwardSetState(SCE_H_DEFAULT); - } else if (sc.Match('/', '>')) { - sc.SetState(SCE_H_TAGEND); - sc.Forward(); - sc.ForwardSetState(SCE_H_DEFAULT); - } else { - sc.SetState(SCE_H_OTHER); - } - } - } else if (sc.state == SCE_H_ATTRIBUTE) { - if (!ishtmlwordchar(sc.ch)) { - char s[100]; - sc.GetCurrentLowered(s, sizeof(s)); - if (!keywordsTags.InList(s)) { - sc.ChangeState(SCE_H_ATTRIBUTEUNKNOWN); - } - sc.SetState(SCE_H_OTHER); - } - } else if (sc.state == SCE_H_OTHER) { - if (sc.ch == '>') { - sc.SetState(SCE_H_TAG); - sc.ForwardSetState(SCE_H_DEFAULT); - } else if (sc.Match('/', '>')) { - sc.SetState(SCE_H_TAG); - sc.Forward(); - sc.ForwardSetState(SCE_H_DEFAULT); - } else if (sc.chPrev == '=') { - sc.SetState(SCE_H_VALUE); - } - } else if (sc.state == SCE_H_DOUBLESTRING) { - if (sc.ch == '\"') { - sc.ForwardSetState(SCE_H_OTHER); - } - } else if (sc.state == SCE_H_SINGLESTRING) { - if (sc.ch == '\'') { - sc.ForwardSetState(SCE_H_OTHER); - } - } else if (sc.state == SCE_H_NUMBER) { - if (!IsADigit(sc.ch)) { - sc.SetState(SCE_H_OTHER); - } - } - - if (sc.state == SCE_H_DEFAULT) { - if (sc.ch == '<') { - if (sc.Match("\n"; - line_prefix = ""; - break; - } - - case GEANY_FILETYPES_PYTHON: - case GEANY_FILETYPES_R: - case GEANY_FILETYPES_RUBY: - case GEANY_FILETYPES_SH: - case GEANY_FILETYPES_MAKE: - case GEANY_FILETYPES_PERL: - case GEANY_FILETYPES_DIFF: - case GEANY_FILETYPES_TCL: - case GEANY_FILETYPES_CONF: - case GEANY_FILETYPES_PO: - case GEANY_FILETYPES_YAML: - case GEANY_FILETYPES_CMAKE: - { - line_prefix = "#"; - break; - } - - case GEANY_FILETYPES_JS: - case GEANY_FILETYPES_HAXE: - { - line_prefix = "//"; - break; - } - - case GEANY_FILETYPES_LATEX: - case GEANY_FILETYPES_MATLAB: - { - line_prefix = "%"; - break; - } - - case GEANY_FILETYPES_ADA: - case GEANY_FILETYPES_HASKELL: - case GEANY_FILETYPES_VHDL: - case GEANY_FILETYPES_LUA: - { - line_prefix = "--"; - break; - } - - case GEANY_FILETYPES_FORTRAN: - { - line_prefix = "!"; - break; - } - - case GEANY_FILETYPES_F77: - { - line_prefix = "c"; - break; - } - - case GEANY_FILETYPES_ASM: - case GEANY_FILETYPES_NSIS: - { - line_prefix = ";"; - break; - } + g_return_val_if_fail(ft != NULL, NULL); - case GEANY_FILETYPES_BASIC: - { - line_prefix = "'"; - break; - } - - case GEANY_FILETYPES_PASCAL: + if (NZV(ft->comment_open)) + { + if (NZV(ft->comment_close)) { - frame_start = "{\n"; - frame_end = "}\n"; + frame_start = g_strconcat(ft->comment_open, "\n", NULL); + frame_end = g_strconcat(ft->comment_close, "\n", NULL); line_prefix = ""; - break; } - - case GEANY_FILETYPES_CAML: - { - frame_start = "(*\n"; - frame_end = " *)\n"; - line_prefix = " *"; - break; - } - - case GEANY_FILETYPES_NONE: + else { - line_prefix = ""; - break; + frame_start = NULL; + frame_end = NULL; + line_prefix = ft->comment_open; } + } + else + { /* use C-like multi-line comments as fallback */ + frame_start = g_strdup("/*\n"); + frame_end = g_strdup("*/\n"); + line_prefix = ""; + } - default: /* assume C-like multi-line comment is appropriate */ - { - frame_start = "/*\n"; - frame_end = " */\n"; - line_prefix = " *"; - } + /* do some magic to nicely format C-like multi-line comments */ + if (NZV(frame_start) && frame_start[1] == '*') + { + /* prefix the string with a space */ + setptr(frame_end, g_strconcat(" ", frame_end, NULL)); + line_prefix = " *"; } /* construct the real prefix with given amount of whitespace */ @@ -676,7 +641,6 @@ prefix = g_strconcat(line_prefix, tmp, NULL); g_free(tmp); - /* add line_prefix to every line of comment_text */ lines = g_strsplit(comment_text, "\n", -1); len = g_strv_length(lines) - 1; @@ -689,10 +653,12 @@ tmp = g_strjoinv("\n", lines); /* add frame_start and frame_end */ - result = g_strconcat(frame_start, tmp, frame_end, NULL); + if (frame_start != NULL) + result = g_strconcat(frame_start, tmp, frame_end, NULL); + else + result = g_strconcat(tmp, frame_end, NULL); - g_free(prefix); - g_free(tmp); + utils_free_pointers(4, prefix, tmp, frame_start, frame_end, NULL); g_strfreev(lines); return result; } @@ -728,10 +694,10 @@ else shortname = g_path_get_basename(fname); - template = utils_str_replace(template, "{filename}", shortname); - template = utils_str_replace(template, "{gpl}", templates[GEANY_TEMPLATE_GPL]); - template = utils_str_replace(template, "{bsd}", templates[GEANY_TEMPLATE_BSD]); - template = utils_str_replace(template, "{datetime}", date); + 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); result = make_comment_block(template, ft_id, 8); @@ -760,7 +726,7 @@ file_header = templates_get_template_fileheader(ft->id, NULL); /* file template only used for new files */ ft_template = get_file_template(ft); - ft_template = utils_str_replace(ft_template, "{fileheader}", file_header); + utils_str_replace_all(&ft_template, "{fileheader}", file_header); g_free(file_header); return ft_template; } @@ -779,9 +745,9 @@ gchar *datetime = utils_get_date_time(template_prefs.datetime_format, NULL); gchar *result; - template = utils_str_replace(template, "{date}", date); - template = utils_str_replace(template, "{datetime}", datetime); - template = utils_str_replace(template, "{functionname}", (func_name) ? func_name : ""); + utils_str_replace_all(&template, "{date}", date); + utils_str_replace_all(&template, "{datetime}", datetime); + utils_str_replace_all(&template, "{functionname}", (func_name) ? func_name : ""); result = make_comment_block(template, filetype_idx, 3); @@ -796,7 +762,8 @@ { gchar *date = utils_get_date_time(template_prefs.datetime_format, NULL); gchar *result = g_strdup(templates[GEANY_TEMPLATE_CHANGELOG]); - result = utils_str_replace(result, "{date}", date); + + utils_str_replace_all(&result, "{date}", date); g_free(date); return result; @@ -807,6 +774,8 @@ { 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"))); for (i = 0; i < GEANY_MAX_TEMPLATES; i++) { @@ -817,16 +786,14 @@ g_free(ft_templates[i]); } /* destroy "New with template" sub menu items (in case we want to reload the templates) */ - if (ui_widgets.new_file_menu != NULL) + children = gtk_container_get_children(GTK_CONTAINER(toolbar_new_file_menu)); + foreach_list(item, children) { - children = gtk_container_get_children(GTK_CONTAINER(ui_widgets.new_file_menu)); - for (item = children; item != NULL; item = g_list_next(item)) - { - gtk_widget_destroy(GTK_WIDGET(item->data)); - } + 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)); - for (item = children; item != NULL; item = g_list_next(item)) + foreach_list(item, children) { gtk_widget_destroy(GTK_WIDGET(item->data)); } diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/toolbar.c /tmp/ssBwSf4GIv/geany-0.18/src/toolbar.c --- geany-0.17/src/toolbar.c 2009-04-21 21:53:42.000000000 +0100 +++ geany-0.18/src/toolbar.c 2009-07-23 12:00:32.000000000 +0100 @@ -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: toolbar.c 3721 2009-04-21 20:53:42Z eht16 $ + * $Id: toolbar.c 4012 2009-07-23 11:00:32Z ntrel $ */ @@ -35,21 +35,25 @@ #include "dialogs.h" #include "document.h" #include "build.h" +#include "main.h" #include "geanymenubuttonaction.h" #include "geanyentryaction.h" +#include +#include GeanyToolbarPrefs toolbar_prefs; static GtkUIManager *uim; static GtkActionGroup *group; - +static GSList *plugin_items = NULL; /* Available toolbar actions * Fields: name, stock_id, label, accelerator, tooltip, callback */ const GtkActionEntry ui_entries[] = { + /* custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" */ { "Save", GTK_STOCK_SAVE, NULL, NULL, N_("Save the current file"), G_CALLBACK(on_toolbutton_save_clicked) }, - { "SaveAll", GEANY_STOCK_SAVE_ALL, N_("Save All"), NULL, N_("Save all open files"), G_CALLBACK(on_save_all1_activate) }, + { "SaveAll", GEANY_STOCK_SAVE_ALL, NULL, NULL, N_("Save all open files"), G_CALLBACK(on_save_all1_activate) }, { "Reload", GTK_STOCK_REVERT_TO_SAVED, NULL, NULL, N_("Reload the current file from disk"), G_CALLBACK(on_toolbutton_reload_clicked) }, { "Close", GTK_STOCK_CLOSE, NULL, NULL, N_("Close the current file"), G_CALLBACK(on_toolbutton_close_clicked) }, { "CloseAll", GEANY_STOCK_CLOSE_ALL, NULL, NULL, N_("Close all open files"), G_CALLBACK(on_toolbutton_close_all_clicked) }, @@ -72,7 +76,8 @@ { "Goto", GTK_STOCK_JUMP_TO, NULL, NULL, N_("Jump to the entered line number"), G_CALLBACK(on_toolbutton_goto_clicked) }, { "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL, N_("Show the preferences dialog"), G_CALLBACK(on_toolbutton_preferences_clicked) }, { "Quit", GTK_STOCK_QUIT, NULL, NULL, N_("Quit Geany"), G_CALLBACK(on_toolbutton_quit_clicked) }, - { "Print", GTK_STOCK_PRINT, NULL, NULL, N_("Print document"), G_CALLBACK(on_print1_activate) } + { "Print", GTK_STOCK_PRINT, NULL, NULL, N_("Print document"), G_CALLBACK(on_print1_activate) }, + { "Replace", GTK_STOCK_FIND_AND_REPLACE, NULL, NULL, N_("Replace text in the current document"), G_CALLBACK(on_replace1_activate) } }; const guint ui_entries_n = G_N_ELEMENTS(ui_entries); @@ -93,6 +98,7 @@ "" "" "" + "" "" "" "" @@ -108,6 +114,10 @@ ""; +/* Note: The returned widget pointer is only valid until the toolbar is reloaded. So, either + * update the widget pointer in this case (i.e. request it again) or better use + * toolbar_get_action_by_name() instead. The action objects will remain the same even when the + * toolbar is reloaded. */ GtkWidget *toolbar_get_widget_by_name(const gchar *name) { GtkWidget *widget; @@ -123,6 +133,8 @@ } +/* Note: The returned widget pointer is only valid until the toolbar is reloaded. See + * toolbar_get_widget_by_name for details(). */ GtkWidget *toolbar_get_widget_child_by_name(const gchar *name) { GtkWidget *widget = toolbar_get_widget_by_name(name); @@ -142,24 +154,164 @@ } -static void on_document_save(G_GNUC_UNUSED GObject *object, GeanyDocument *doc, - G_GNUC_UNUSED gpointer data) +static void toolbar_item_destroy_cb(GtkWidget *widget, G_GNUC_UNUSED gpointer data) { - g_return_if_fail(NZV(doc->real_path)); + plugin_items = g_slist_remove(plugin_items, widget); +} - if (utils_str_equal(doc->real_path, utils_build_path(app->configdir, "ui_toolbar.xml", NULL))) - { - dialogs_show_msgbox(GTK_MESSAGE_INFO, - _("For all changes you make in this file to take effect, you need to restart Geany.")); - } + +void toolbar_item_ref(GtkToolItem *item) +{ + g_return_if_fail(item != NULL); + + plugin_items = g_slist_append(plugin_items, item); + g_signal_connect(item, "destroy", G_CALLBACK(toolbar_item_destroy_cb), NULL); } -void toolbar_add_config_file_menu_item(void) +static GtkWidget *toolbar_reload(const gchar *markup) { - ui_add_config_file_menu_item( - utils_build_path(app->configdir, "ui_toolbar.xml", NULL), NULL, NULL); - g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL); + gint i; + GSList *l; + GtkWidget *entry; + GError *error = NULL; + const gchar *filename; + static guint merge_id = 0; + GtkWidget *toolbar_new_file_menu = NULL; + GtkWidget *toolbar_recent_files_menu = NULL; + GtkWidget *toolbar_build_menu = NULL; + + /* Cleanup old toolbar */ + if (merge_id > 0) + { + /* ref plugins toolbar items to keep them after we destroyed the toolbar */ + foreach_slist(l, plugin_items) + { + g_object_ref(l->data); + gtk_container_remove(GTK_CONTAINER(main_widgets.toolbar), GTK_WIDGET(l->data)); + } + /* ref and hold the submenus of the New, Open and Build toolbar items */ + toolbar_new_file_menu = geany_menu_button_action_get_menu( + GEANY_MENU_BUTTON_ACTION(gtk_action_group_get_action(group, "New"))); + g_object_ref(toolbar_new_file_menu); + toolbar_recent_files_menu = geany_menu_button_action_get_menu( + GEANY_MENU_BUTTON_ACTION(gtk_action_group_get_action(group, "Open"))); + g_object_ref(toolbar_recent_files_menu); + toolbar_build_menu = geany_menu_button_action_get_menu( + GEANY_MENU_BUTTON_ACTION(gtk_action_group_get_action(group, "Build"))); + g_object_ref(toolbar_build_menu); + + /* Get rid of it! */ + gtk_widget_destroy(main_widgets.toolbar); + + gtk_ui_manager_remove_ui(uim, merge_id); + gtk_ui_manager_ensure_update(uim); + } + + if (markup != NULL) + { + merge_id = gtk_ui_manager_add_ui_from_string(uim, markup, -1, &error); + } + else + { + /* Load the toolbar UI XML file from disk (first from config dir, then try data dir) */ + filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); + merge_id = gtk_ui_manager_add_ui_from_file(uim, filename, &error); + if (merge_id == 0) + { + if (! g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) + geany_debug("Loading user toolbar UI definition failed (%s).", error->message); + g_error_free(error); + error = NULL; + + filename = utils_build_path(app->datadir, "ui_toolbar.xml", NULL); + merge_id = gtk_ui_manager_add_ui_from_file(uim, filename, &error); + } + } + if (error != NULL) + { + geany_debug("UI creation failed, using internal fallback definition. Error message: %s", + error->message); + g_error_free(error); + /* finally load the internally defined markup as fallback */ + merge_id = gtk_ui_manager_add_ui_from_string(uim, toolbar_markup, -1, NULL); + } + main_widgets.toolbar = gtk_ui_manager_get_widget(uim, "/ui/GeanyToolbar"); + ui_init_toolbar_widgets(); + + /* add the toolbar again to the main window */ + if (toolbar_prefs.append_to_menu) + { + GtkWidget *hbox_menubar = ui_lookup_widget(main_widgets.window, "hbox_menubar"); + gtk_box_pack_start(GTK_BOX(hbox_menubar), main_widgets.toolbar, TRUE, TRUE, 0); + gtk_box_reorder_child(GTK_BOX(hbox_menubar), main_widgets.toolbar, 1); + } + else + { + GtkWidget *box = ui_lookup_widget(main_widgets.window, "vbox1"); + + gtk_box_pack_start(GTK_BOX(box), main_widgets.toolbar, FALSE, FALSE, 0); + gtk_box_reorder_child(GTK_BOX(box), main_widgets.toolbar, 1); + } + gtk_widget_show(main_widgets.toolbar); + + /* re-add und unref the plugin toolbar items */ + i = toolbar_get_insert_position(); + foreach_slist(l, plugin_items) + { + gtk_toolbar_insert(GTK_TOOLBAR(main_widgets.toolbar), l->data, i); + g_object_unref(l->data); + i++; + } + /* re-add und unref the submenus of menu toolbar items */ + if (toolbar_new_file_menu != NULL) + { + geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION( + gtk_action_group_get_action(group, "New")), toolbar_new_file_menu); + g_object_unref(toolbar_new_file_menu); + } + if (toolbar_recent_files_menu != NULL) + { + geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION( + gtk_action_group_get_action(group, "Open")), toolbar_recent_files_menu); + g_object_unref(toolbar_recent_files_menu); + } + if (toolbar_build_menu != NULL) + { + geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION( + gtk_action_group_get_action(group, "Build")), toolbar_build_menu); + g_object_unref(toolbar_build_menu); + } + + /* update button states */ + if (main_status.main_window_realized) + { + GeanyDocument *doc = document_get_current(); + + ui_document_buttons_update(); + ui_save_buttons_toggle(doc->changed); /* update save all */ + ui_update_popup_reundo_items(doc); + + toolbar_apply_settings(); + } + + /* Signals */ + g_signal_connect(main_widgets.toolbar, "button-press-event", + G_CALLBACK(toolbar_popup_menu), NULL); + g_signal_connect(main_widgets.toolbar, "key-press-event", + G_CALLBACK(on_escape_key_press_event), NULL); + + /* We don't need to disconnect those signals as this is done automatically when the entry + * widgets are destroyed, happens when the toolbar itself is destroyed. */ + entry = toolbar_get_widget_child_by_name("SearchEntry"); + if (entry != NULL) + g_signal_connect(entry, "motion-notify-event", G_CALLBACK(on_motion_event), NULL); + entry = toolbar_get_widget_child_by_name("GotoEntry"); + if (entry != NULL) + g_signal_connect(entry, "motion-notify-event", G_CALLBACK(on_motion_event), NULL); + + + return main_widgets.toolbar; } @@ -171,8 +323,6 @@ GtkAction *action_build; GtkAction *action_searchentry; GtkAction *action_gotoentry; - GError *error = NULL; - const gchar *filename; uim = gtk_ui_manager_new(); group = gtk_action_group_new("GeanyToolbar"); @@ -212,35 +362,7 @@ gtk_ui_manager_insert_action_group(uim, group, 0); - /* Load the toolbar UI XML file from disk (first from config dir, then try data dir) */ - filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); - if (! gtk_ui_manager_add_ui_from_file(uim, filename, &error)) - { - if (error->code != G_FILE_ERROR_NOENT) - geany_debug("Loading user toolbar UI definition failed (%s).", error->message); - g_error_free(error); - error = NULL; - - filename = utils_build_path(app->datadir, "ui_toolbar.xml", NULL); - if (! gtk_ui_manager_add_ui_from_file(uim, filename, &error)) - { - geany_debug( - "UI creation failed, using internal fallback definition. Error message: %s", - error->message); - g_error_free(error); - /* finally load the internally defined markup as fallback */ - gtk_ui_manager_add_ui_from_string(uim, toolbar_markup, -1, NULL); - } - } - - /* Set some pointers */ - toolbar = gtk_ui_manager_get_widget(uim, "/ui/GeanyToolbar"); - ui_widgets.new_file_menu = geany_menu_button_action_get_menu( - GEANY_MENU_BUTTON_ACTION(action_new)); - ui_widgets.recent_files_menu_toolbar = geany_menu_button_action_get_menu( - GEANY_MENU_BUTTON_ACTION(action_open)); - - g_signal_connect(toolbar, "key-press-event", G_CALLBACK(on_escape_key_press_event), NULL); + toolbar = toolbar_reload(NULL); return toolbar; } @@ -351,7 +473,593 @@ void toolbar_finalize(void) { - /* unref'ing the GtkUIManager object will destroy all its widgets unless they were ref'ed */ + g_object_unref(geany_menu_button_action_get_menu( + GEANY_MENU_BUTTON_ACTION(toolbar_get_action_by_name("Open")))); + + /* unref'ing the GtkUIManager object will destroy all its widgets unless they were ref'ed */ g_object_unref(uim); - g_object_unref(group); + g_object_unref(group); + + g_slist_free(plugin_items); +} + + +void toolbar_show_hide(void) +{ + ignore_callback = TRUE; + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( + ui_lookup_widget(main_widgets.window, "menu_show_toolbar1")), toolbar_prefs.visible); + ui_widget_show_hide(main_widgets.toolbar, toolbar_prefs.visible); + ignore_callback = FALSE; +} + + +void toolbar_apply_settings(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); + + /* 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); + } +} + + +#define TB_EDITOR_SEPARATOR _("Separator") +#define TB_EDITOR_SEPARATOR_LABEL _("--- Separator ---") +typedef struct +{ + GtkWidget *dialog; + + GtkTreeView *tree_available; + GtkTreeView *tree_used; + + GtkListStore *store_available; + GtkListStore *store_used; + + GtkTreePath *last_drag_path; + GtkTreeViewDropPosition last_drag_pos; + + GtkWidget *drag_source; +} TBEditorWidget; + +static const GtkTargetEntry tb_editor_dnd_targets[] = +{ + { "GEANY_TB_EDITOR_ROW", 0, 0 } +}; +static const gint tb_editor_dnd_targets_len = G_N_ELEMENTS(tb_editor_dnd_targets); + +enum +{ + TB_EDITOR_COL_ACTION, + TB_EDITOR_COL_LABEL, + TB_EDITOR_COL_ICON, + TB_EDITOR_COLS_MAX +}; + +static void tb_editor_handler_start_element(GMarkupParseContext *context, const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, gpointer data, + GError **error) +{ + gint i; + GSList **actions = data; + + /* This is very basic parsing, stripped down any error checking, requires a valid UI markup. */ + if (utils_str_equal(element_name, "separator")) + *actions = g_slist_append(*actions, g_strdup(TB_EDITOR_SEPARATOR)); + + for (i = 0; attribute_names[i] != NULL; i++) + { + if (utils_str_equal(attribute_names[i], "action")) + { + *actions = g_slist_append(*actions, g_strdup(attribute_values[i])); + } + } +} + +static const GMarkupParser tb_editor_xml_parser = +{ + tb_editor_handler_start_element, NULL, NULL, NULL, NULL +}; + + +static GSList *tb_editor_parse_ui(const gchar *buffer, gssize length, GError **error) +{ + GMarkupParseContext *context; + GSList *list = NULL; + + context = g_markup_parse_context_new(&tb_editor_xml_parser, 0, &list, NULL); + g_markup_parse_context_parse(context, buffer, length, error); + g_markup_parse_context_free(context); + + return list; +} + + +static void tb_editor_set_item_values(const gchar *name, GtkListStore *store, GtkTreeIter *iter) +{ + gchar *icon = NULL; + gchar *label = NULL; + gchar *label_clean = NULL; + GtkAction *action; + + action = gtk_action_group_get_action(group, name); + if (action == NULL) + { + if (utils_str_equal(name, TB_EDITOR_SEPARATOR)) + label_clean = g_strdup(TB_EDITOR_SEPARATOR_LABEL); + else + return; + } + else + { + g_object_get(action, "icon-name", &icon, NULL); + if (icon == NULL) + g_object_get(action, "stock-id", &icon, NULL); + + g_object_get(action, "label", &label, NULL); + if (label != NULL) + label_clean = utils_str_remove_chars(g_strdup(label), "_"); + } + + gtk_list_store_set(store, iter, + TB_EDITOR_COL_ACTION, name, + TB_EDITOR_COL_LABEL, label_clean, + TB_EDITOR_COL_ICON, icon, + -1); + + g_free(icon); + g_free(label); + g_free(label_clean); +} + + +static void tb_editor_scroll_to_iter(GtkTreeView *treeview, GtkTreeIter *iter) +{ + GtkTreePath *path = gtk_tree_model_get_path(gtk_tree_view_get_model(treeview), iter); + gtk_tree_view_scroll_to_cell(treeview, path, NULL, TRUE, 0.5, 0.0); + gtk_tree_path_free(path); +} + + +static void tb_editor_free_path(TBEditorWidget *tbw) +{ + if (tbw->last_drag_path != NULL) + { + gtk_tree_path_free(tbw->last_drag_path); + tbw->last_drag_path = NULL; + } +} + + +static void tb_editor_btn_remove_clicked_cb(GtkWidget *button, TBEditorWidget *tbw) +{ + GtkTreeModel *model_used; + GtkTreeSelection *selection_used; + GtkTreeIter iter_used, iter_new; + gchar *action_name; + + selection_used = gtk_tree_view_get_selection(tbw->tree_used); + if (gtk_tree_selection_get_selected(selection_used, &model_used, &iter_used)) + { + gtk_tree_model_get(model_used, &iter_used, TB_EDITOR_COL_ACTION, &action_name, -1); + if (gtk_list_store_remove(tbw->store_used, &iter_used)) + gtk_tree_selection_select_iter(selection_used, &iter_used); + + if (! utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) + { + gtk_list_store_append(tbw->store_available, &iter_new); + tb_editor_set_item_values(action_name, tbw->store_available, &iter_new); + tb_editor_scroll_to_iter(tbw->tree_available, &iter_new); + } + + g_free(action_name); + } +} + + +static void tb_editor_btn_add_clicked_cb(GtkWidget *button, TBEditorWidget *tbw) +{ + GtkTreeModel *model_available; + GtkTreeSelection *selection_available, *selection_used; + GtkTreeIter iter_available, iter_new, iter_selected; + gchar *action_name; + + selection_available = gtk_tree_view_get_selection(tbw->tree_available); + if (gtk_tree_selection_get_selected(selection_available, &model_available, &iter_available)) + { + gtk_tree_model_get(model_available, &iter_available, + TB_EDITOR_COL_ACTION, &action_name, -1); + if (! utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) + { + if (gtk_list_store_remove(tbw->store_available, &iter_available)) + gtk_tree_selection_select_iter(selection_available, &iter_available); + } + + selection_used = gtk_tree_view_get_selection(tbw->tree_used); + if (gtk_tree_selection_get_selected(selection_used, NULL, &iter_selected)) + gtk_list_store_insert_before(tbw->store_used, &iter_new, &iter_selected); + else + gtk_list_store_append(tbw->store_used, &iter_new); + + tb_editor_set_item_values(action_name, tbw->store_used, &iter_new); + tb_editor_scroll_to_iter(tbw->tree_used, &iter_new); + + g_free(action_name); + } +} + + +static gboolean tb_editor_drag_motion_cb(GtkWidget *widget, GdkDragContext *drag_context, + gint x, gint y, guint ltime, TBEditorWidget *tbw) +{ + if (tbw->last_drag_path != NULL) + gtk_tree_path_free(tbw->last_drag_path); + gtk_tree_view_get_drag_dest_row(GTK_TREE_VIEW(widget), + &(tbw->last_drag_path), &(tbw->last_drag_pos)); + + return FALSE; +} + + +static void tb_editor_drag_data_get_cb(GtkWidget *widget, GdkDragContext *context, + GtkSelectionData *data, guint info, guint ltime, + TBEditorWidget *tbw) +{ + GtkTreeIter iter; + GtkTreeSelection *selection; + GtkTreeModel *model; + GdkAtom atom; + gchar *name; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + if (! gtk_tree_selection_get_selected(selection, &model, &iter)) + return; + + gtk_tree_model_get(model, &iter, TB_EDITOR_COL_ACTION, &name, -1); + if (! NZV(name)) + return; + + atom = gdk_atom_intern(tb_editor_dnd_targets[0].target, FALSE); + gtk_selection_data_set(data, atom, 8, (guchar*) name, strlen(name)); + + g_free(name); + + tbw->drag_source = widget; } + + +static void tb_editor_drag_data_rcvd_cb(GtkWidget *widget, GdkDragContext *context, + gint x, gint y, GtkSelectionData *data, guint info, + guint ltime, TBEditorWidget *tbw) +{ + GtkTreeView *tree = GTK_TREE_VIEW(widget); + gboolean del = FALSE; + + if (data->length >= 0 && data->format == 8) + { + gboolean is_sep; + gchar *text = NULL; + + text = (gchar*) data->data; + is_sep = utils_str_equal(text, TB_EDITOR_SEPARATOR); + /* If the source of the action is equal to the target, we do just re-order and so need + * to delete the separator to get it moved, not just copied. */ + if (is_sep && widget == tbw->drag_source) + is_sep = FALSE; + + if (tree != tbw->tree_available || ! is_sep) + { + GtkTreeIter iter, iter_before, *iter_before_ptr; + GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(tree)); + + if (tbw->last_drag_path != NULL) + { + gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter_before, tbw->last_drag_path); + + if (gtk_list_store_iter_is_valid(store, &iter_before)) + iter_before_ptr = &iter_before; + else + iter_before_ptr = NULL; + + if (tbw->last_drag_pos == GTK_TREE_VIEW_DROP_BEFORE || + tbw->last_drag_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) + gtk_list_store_insert_before(store, &iter, iter_before_ptr); + else + gtk_list_store_insert_after(store, &iter, iter_before_ptr); + } + else + gtk_list_store_append(store, &iter); + + tb_editor_set_item_values(text, store, &iter); + tb_editor_scroll_to_iter(tree, &iter); + } + if (tree != tbw->tree_used || ! is_sep) + del = TRUE; + } + + tbw->drag_source = NULL; /* reset the value just to be sure */ + tb_editor_free_path(tbw); + gtk_drag_finish(context, TRUE, del, ltime); +} + + +static gboolean tb_editor_foreach_used(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data) +{ + gchar *action_name; + + gtk_tree_model_get(model, iter, TB_EDITOR_COL_ACTION, &action_name, -1); + + if (utils_str_equal(action_name, TB_EDITOR_SEPARATOR)) + g_string_append_printf(data, "\t\t\n"); + else if (NZV(action_name)) + g_string_append_printf(data, "\t\t\n", action_name); + + g_free(action_name); + return FALSE; +} + + +static void tb_editor_write_markup(TBEditorWidget *tbw) +{ + /* must be the first tag, otherwise gtk_ui_manager_add_ui_from_string() will fail. */ + const gchar *template = "\n\n\ +\t\n"; + const gchar *filename = utils_build_path(app->configdir, "ui_toolbar.xml", NULL); + GString *str = g_string_new(template); + + gtk_tree_model_foreach(GTK_TREE_MODEL(tbw->store_used), tb_editor_foreach_used, str); + + g_string_append(str, "\n\t\n\n"); + + toolbar_reload(str->str); + + utils_write_file(filename, str->str); + + g_string_free(str, TRUE); +} + + +static void tb_editor_available_items_changed_cb(GtkTreeModel *model, GtkTreePath *arg1, + GtkTreeIter *arg2, TBEditorWidget *tbw) +{ + tb_editor_write_markup(tbw); +} + + +static void tb_editor_available_items_deleted_cb(GtkTreeModel *model, GtkTreePath *arg1, + TBEditorWidget *tbw) +{ + tb_editor_write_markup(tbw); +} + + +static TBEditorWidget *tb_editor_create_dialog(void) +{ + GtkWidget *dialog, *vbox, *hbox, *vbox_buttons, *button_add, *button_remove; + GtkWidget *swin_available, *swin_used, *tree_available, *tree_used, *label; + GtkCellRenderer *text_renderer, *icon_renderer; + GtkTreeViewColumn *column; + TBEditorWidget *tbw = g_new(TBEditorWidget, 1); + + dialog = gtk_dialog_new_with_buttons(_("Customize Toolbar"), + GTK_WINDOW(main_widgets.window), + GTK_DIALOG_DESTROY_WITH_PARENT, + 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), -1, 400); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); + + tbw->store_available = gtk_list_store_new(TB_EDITOR_COLS_MAX, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + tbw->store_used = gtk_list_store_new(TB_EDITOR_COLS_MAX, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + + label = gtk_label_new( + _("Select items to be displayed on the toolbar. Items can be reordered by drag and drop.")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + + tree_available = gtk_tree_view_new(); + gtk_tree_view_set_model(GTK_TREE_VIEW(tree_available), GTK_TREE_MODEL(tbw->store_available)); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree_available), TRUE); + gtk_tree_sortable_set_sort_column_id( + GTK_TREE_SORTABLE(tbw->store_available), TB_EDITOR_COL_LABEL, GTK_SORT_ASCENDING); + + icon_renderer = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new_with_attributes( + NULL, icon_renderer, "stock-id", TB_EDITOR_COL_ICON, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_available), column); + + text_renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes( + _("Available Items"), text_renderer, "text", TB_EDITOR_COL_LABEL, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_available), column); + + swin_available = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_available), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_available), GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(swin_available), tree_available); + + tree_used = gtk_tree_view_new(); + gtk_tree_view_set_model(GTK_TREE_VIEW(tree_used), GTK_TREE_MODEL(tbw->store_used)); + gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree_used), TRUE); + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(tree_used), TRUE); + + icon_renderer = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new_with_attributes( + NULL, icon_renderer, "stock-id", TB_EDITOR_COL_ICON, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_used), column); + + text_renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes( + _("Displayed Items"), text_renderer, "text", TB_EDITOR_COL_LABEL, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_used), column); + + swin_used = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_used), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(swin_used), tree_used); + + /* drag'n'drop */ + gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree_available), GDK_BUTTON1_MASK, + tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); + gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(tree_available), + tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); + g_signal_connect(tree_available, "drag-data-get", + G_CALLBACK(tb_editor_drag_data_get_cb), tbw); + g_signal_connect(tree_available, "drag-data-received", + G_CALLBACK(tb_editor_drag_data_rcvd_cb), tbw); + g_signal_connect(tree_available, "drag-motion", + G_CALLBACK(tb_editor_drag_motion_cb), tbw); + + gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(tree_used), GDK_BUTTON1_MASK, + tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); + gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(tree_used), + tb_editor_dnd_targets, tb_editor_dnd_targets_len, GDK_ACTION_MOVE); + g_signal_connect(tree_used, "drag-data-get", + G_CALLBACK(tb_editor_drag_data_get_cb), tbw); + g_signal_connect(tree_used, "drag-data-received", + G_CALLBACK(tb_editor_drag_data_rcvd_cb), tbw); + g_signal_connect(tree_used, "drag-motion", + G_CALLBACK(tb_editor_drag_motion_cb), tbw); + + + button_add = ui_button_new_with_image(GTK_STOCK_GO_FORWARD, NULL); + button_remove = ui_button_new_with_image(GTK_STOCK_GO_BACK, NULL); + g_signal_connect(button_add, "clicked", G_CALLBACK(tb_editor_btn_add_clicked_cb), tbw); + g_signal_connect(button_remove, "clicked", G_CALLBACK(tb_editor_btn_remove_clicked_cb), tbw); + + vbox_buttons = gtk_vbox_new(FALSE, 6); + /* FIXME this is a little hack'ish, any better ideas? */ + gtk_box_pack_start(GTK_BOX(vbox_buttons), gtk_label_new(""), TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox_buttons), button_add, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox_buttons), button_remove, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox_buttons), gtk_label_new(""), TRUE, TRUE, 0); + + hbox = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(hbox), swin_available, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), vbox_buttons, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), swin_used, TRUE, TRUE, 0); + + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + + gtk_widget_show_all(vbox); + + g_object_unref(tbw->store_available); + g_object_unref(tbw->store_used); + + tbw->dialog = dialog; + tbw->tree_available = GTK_TREE_VIEW(tree_available); + tbw->tree_used = GTK_TREE_VIEW(tree_used); + + tbw->last_drag_path = NULL; + + return tbw; +} + + +void toolbar_configure(void) +{ + gchar *markup; + const gchar *name; + GSList *sl, *used_items; + GList *l, *all_items; + GtkTreeIter iter; + GtkTreePath *path; + TBEditorWidget *tbw; + + /* read the current active toolbar items */ + markup = gtk_ui_manager_get_ui(uim); + used_items = tb_editor_parse_ui(markup, strlen(markup), NULL); + g_free(markup); + + /* get all available actions */ + all_items = gtk_action_group_list_actions(group); + + /* create the GUI */ + tbw = tb_editor_create_dialog(); + + /* fill the stores */ + gtk_list_store_insert_with_values(tbw->store_available, NULL, -1, + TB_EDITOR_COL_ACTION, TB_EDITOR_SEPARATOR, + TB_EDITOR_COL_LABEL, TB_EDITOR_SEPARATOR_LABEL, + -1); + foreach_list(l, all_items) + { + name = gtk_action_get_name(l->data); + if (g_slist_find_custom(used_items, name, (GCompareFunc) strcmp) == NULL) + { + gtk_list_store_append(tbw->store_available, &iter); + tb_editor_set_item_values(name, tbw->store_available, &iter); + } + } + foreach_slist(sl, used_items) + { + gtk_list_store_append(tbw->store_used, &iter); + tb_editor_set_item_values(sl->data, tbw->store_used, &iter); + } + /* select first item */ + path = gtk_tree_path_new_from_string("0"); + gtk_tree_selection_select_path(gtk_tree_view_get_selection(tbw->tree_used), path); + gtk_tree_path_free(path); + + /* connect the changed signals after populating the store */ + g_signal_connect(tbw->store_used, "row-changed", + G_CALLBACK(tb_editor_available_items_changed_cb), tbw); + g_signal_connect(tbw->store_used, "row-deleted", + G_CALLBACK(tb_editor_available_items_deleted_cb), tbw); + + /* run it */ + gtk_dialog_run(GTK_DIALOG(tbw->dialog)); + + gtk_widget_destroy(tbw->dialog); + + g_slist_foreach(used_items, (GFunc) g_free, NULL); + g_slist_free(used_items); + g_list_free(all_items); + tb_editor_free_path(tbw); + g_free(tbw); +} + + diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/toolbar.h /tmp/ssBwSf4GIv/geany-0.18/src/toolbar.h --- geany-0.17/src/toolbar.h 2009-03-29 17:15:35.000000000 +0100 +++ geany-0.18/src/toolbar.h 2009-07-21 23:10:42.000000000 +0100 @@ -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: toolbar.h 3668 2009-03-29 16:15:35Z eht16 $ + * $Id: toolbar.h 4009 2009-07-21 22:10:42Z eht16 $ */ #ifndef GEANY_TOOLBAR_H @@ -45,12 +45,18 @@ gint toolbar_get_insert_position(void); -void toolbar_add_config_file_menu_item(void); - void toolbar_update_ui(void); +void toolbar_apply_settings(void); + +void toolbar_show_hide(void); + +void toolbar_item_ref(GtkToolItem *item); + GtkWidget *toolbar_init(void); void toolbar_finalize(void); +void toolbar_configure(void); + #endif diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/treeviews.c /tmp/ssBwSf4GIv/geany-0.18/src/treeviews.c --- geany-0.17/src/treeviews.c 2009-04-27 21:22:47.000000000 +0100 +++ geany-0.18/src/treeviews.c 2009-07-20 16:46:35.000000000 +0100 @@ -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: treeviews.c 3743 2009-04-27 20:22:47Z eht16 $ + * $Id: treeviews.c 3999 2009-07-20 15:46:35Z ntrel $ */ /* @@ -40,18 +40,21 @@ #include "symbols.h" #include "navqueue.h" #include "project.h" +#include "stash.h" +#include "keyfile.h" #include -SidebarTreeviews tv; +SidebarTreeviews tv = {NULL, NULL, NULL}; static struct { GtkWidget *close; GtkWidget *save; GtkWidget *reload; + GtkWidget *show_paths; } -doc_items = {NULL, NULL, NULL}; +doc_items = {NULL, NULL, NULL, NULL}; enum { @@ -77,6 +80,8 @@ }; 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 */ @@ -152,12 +157,33 @@ { if (event->button == 3) { - on_symbols_button_press_event(widget, event, NULL); + 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) { @@ -165,22 +191,7 @@ gtk_container_remove(GTK_CONTAINER(tag_window), gtk_bin_get_child(GTK_BIN(tag_window))); if (tv.default_tag_tree == NULL) - { - 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 */ - } + 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)) @@ -303,6 +314,9 @@ 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(); @@ -310,8 +324,11 @@ { gsize len = strlen(project_base_path); const gchar *rest; - /* check whether the dir name starts with the project base path */ - if (strncmp(tmp_dirname, project_base_path, len) == 0) + + /* 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", @@ -360,7 +377,7 @@ gtk_tree_store_append(store_openfiles, iter, parent); /* check if new parent */ - if (gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), parent) == 1) + if (parent && gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store_openfiles), parent) == 1) { GtkTreePath *path; @@ -513,6 +530,13 @@ } +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); @@ -531,22 +555,22 @@ { GtkWidget *item; - tv.popup_openfiles = gtk_menu_new(); + 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(tv.popup_openfiles), 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(tv.popup_openfiles), 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(tv.popup_openfiles), 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; @@ -555,12 +579,22 @@ 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(tv.popup_openfiles), 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; - sidebar_add_common_menu_items(GTK_MENU(tv.popup_openfiles)); + 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)); } @@ -569,11 +603,12 @@ GtkTreeIter parent; GtkTreePath *path; - 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); + 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); + } } @@ -825,6 +860,9 @@ 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); } @@ -837,21 +875,63 @@ if (event->button == 3) { + if (!openfiles_popup_menu) + create_openfiles_popup_menu(); + documents_menu_update(selection); - gtk_menu_popup(GTK_MENU(tv.popup_openfiles), NULL, NULL, NULL, NULL, + gtk_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); } return FALSE; } -void treeviews_init() +GeanyPrefGroup *stash_group = NULL; + +static void on_load_settings(void) { - tv.default_tag_tree = NULL; tag_window = ui_lookup_widget(main_widgets.window, "scrolledwindow2"); prepare_openfiles(); - create_openfiles_popup_menu(); + /* 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 /tmp/H5qKeNSrz8/geany-0.17/src/treeviews.h /tmp/ssBwSf4GIv/geany-0.18/src/treeviews.h --- geany-0.17/src/treeviews.h 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.18/src/treeviews.h 2009-07-16 16:50:13.000000000 +0100 @@ -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: treeviews.h 3446 2009-01-04 18:30:42Z eht16 $ + * $Id: treeviews.h 3979 2009-07-16 15:50:13Z ntrel $ */ @@ -32,8 +32,8 @@ GtkWidget *tree_openfiles; GtkWidget *default_tag_tree; GtkWidget *popup_taglist; - GtkWidget *popup_openfiles; -} SidebarTreeviews; +} +SidebarTreeviews; extern SidebarTreeviews tv; @@ -48,6 +48,8 @@ void treeviews_init(void); +void treeviews_finalize(void); + void treeviews_update_tag_list(GeanyDocument *doc, gboolean update); void treeviews_openfiles_add(GeanyDocument *doc); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/ui_utils.c /tmp/ssBwSf4GIv/geany-0.18/src/ui_utils.c --- geany-0.17/src/ui_utils.c 2009-04-27 20:30:29.000000000 +0100 +++ geany-0.18/src/ui_utils.c 2009-06-25 18:21:45.000000000 +0100 @@ -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 3739 2009-04-27 19:30:29Z eht16 $ + * $Id: ui_utils.c 3898 2009-06-25 17:21:45Z eht16 $ */ /** @file ui_utils.h @@ -48,6 +48,7 @@ #include "plugins.h" #include "symbols.h" #include "toolbar.h" +#include "geanymenubuttonaction.h" GeanyInterfacePrefs interface_prefs; @@ -58,7 +59,8 @@ static struct { - /* pointers to widgets only sensitive when there is at least one document */ + /* pointers to widgets only sensitive when there is at least one document, the pointers can + * also be GtkAction objects, so check each pointer before using it */ GPtrArray *document_buttons; GtkWidget *menu_insert_include_items[2]; GtkWidget *popup_goto_items[4]; @@ -150,14 +152,6 @@ } -static GeanyFiletype *document_get_filetype(GeanyDocument *doc) -{ - g_return_val_if_fail(doc, NULL); - - return filetypes[FILETYPE_ID(doc->file_type)]; -} - - /* updates the status bar document statistics */ void ui_update_statusbar(GeanyDocument *doc, gint pos) { @@ -173,7 +167,7 @@ const gchar sp[] = " "; guint line, col; const gchar *cur_tag; - gchar *filetype_name = document_get_filetype(doc)->name; + gchar *filetype_name = doc->file_type->name; if (G_UNLIKELY(stats_str == NULL)) stats_str = g_string_sized_new(120); @@ -361,7 +355,7 @@ len = G_N_ELEMENTS(widgets.redo_items); for (i = 0; i < len; i++) { - ui_widget_set_sensitive(widgets.redo_items[i], enable_undo); + ui_widget_set_sensitive(widgets.redo_items[i], enable_redo); } } @@ -618,7 +612,7 @@ g_ptr_array_add(widgets.document_buttons, ui_lookup_widget(main_widgets.window, widget_name)) #define add_doc_toolitem(widget_name) \ - g_ptr_array_add(widgets.document_buttons, toolbar_get_widget_by_name(widget_name)) + g_ptr_array_add(widgets.document_buttons, toolbar_get_action_by_name(widget_name)) static void init_document_widgets(void) { @@ -694,7 +688,10 @@ for (i = 0; i < widgets.document_buttons->len; i++) { GtkWidget *widget = g_ptr_array_index(widgets.document_buttons, i); - ui_widget_set_sensitive(widget, enable); + if (GTK_IS_ACTION(widget)) + gtk_action_set_sensitive(GTK_ACTION(widget), enable); + else + ui_widget_set_sensitive(widget, enable); } } @@ -848,6 +845,28 @@ } +static gboolean have_tango_icon_theme(void) +{ + static gboolean result = FALSE; + static gboolean checked = FALSE; + + if (! checked) + { + gchar *theme_name; + + g_object_get(G_OBJECT(gtk_settings_get_default()), "gtk-icon-theme-name", &theme_name, NULL); + setptr(theme_name, g_utf8_strdown(theme_name, -1)); + + result = (strstr(theme_name, "tango") != NULL); + checked = TRUE; + + g_free(theme_name); + } + + return result; +} + + /* Note: remember to unref the pixbuf once an image or window has added a reference. */ GdkPixbuf *ui_new_pixbuf_from_inline(gint img) { @@ -858,7 +877,12 @@ break; case GEANY_IMAGE_SAVE_ALL: { - return gdk_pixbuf_new_from_inline(-1, save_all_inline, FALSE, NULL); + /* check whether the icon theme looks like a Gnome icon theme, if so use the + * old Gnome based Save All icon, otherwise assume a Tango-like icon theme */ + if (have_tango_icon_theme()) + return gdk_pixbuf_new_from_inline(-1, save_all_tango_inline, FALSE, NULL); + else + return gdk_pixbuf_new_from_inline(-1, save_all_gnome_inline, FALSE, NULL); break; } case GEANY_IMAGE_CLOSE_ALL: @@ -937,7 +961,8 @@ { grf.recent_queue = ui_prefs.recent_queue; grf.menubar = ui_widgets.recent_files_menu_menubar; - grf.toolbar = ui_widgets.recent_files_menu_toolbar; + grf.toolbar = geany_menu_button_action_get_menu(GEANY_MENU_BUTTON_ACTION( + toolbar_get_action_by_name("Open"))); grf.activate_cb = recent_file_activate_cb; } return &grf; @@ -1293,7 +1318,8 @@ } -static void entry_clear_icon_press_cb(GtkEntry *entry, gint icon_pos, GdkEvent *event, gpointer data) +static void entry_clear_icon_release_cb(GtkEntry *entry, gint icon_pos, + GdkEvent *event, gpointer data) { if (event->button.button == 1 && icon_pos == 1) { @@ -1318,7 +1344,7 @@ if (gtk_check_version(2, 15, 2) == NULL) { g_object_set(entry, "secondary-icon-stock", "gtk-clear", NULL); - g_signal_connect(entry, "icon-press", G_CALLBACK(entry_clear_icon_press_cb), NULL); + g_signal_connect(entry, "icon-release", G_CALLBACK(entry_clear_icon_release_cb), NULL); } } @@ -1672,9 +1698,13 @@ static void on_config_file_clicked(GtkWidget *widget, gpointer user_data) { const gchar *file_name = user_data; + GeanyFiletype *ft = NULL; + + if (strstr(file_name, G_DIR_SEPARATOR_S "filetypes.")) + ft = filetypes[GEANY_FILETYPES_CONF]; if (g_file_test(file_name, G_FILE_TEST_EXISTS)) - document_open_file(file_name, FALSE, NULL, NULL); + document_open_file(file_name, FALSE, ft, NULL); else { gchar *utf8 = utils_get_utf8_from_locale(file_name); @@ -1687,7 +1717,7 @@ if (g_file_test(global_file, G_FILE_TEST_EXISTS)) g_file_get_contents(global_file, &global_content, NULL, NULL); - document_new_file(utf8, NULL, global_content); + document_new_file(utf8, ft, global_content); utils_free_pointers(4, utf8, base_name, global_file, global_content, NULL); } } @@ -1744,7 +1774,7 @@ } -static void add_stock_items(void) +void ui_init_stock_items(void) { GtkIconSet *icon_set; GtkIconFactory *factory = gtk_icon_factory_new(); @@ -1774,9 +1804,36 @@ } +void ui_init_toolbar_widgets(void) +{ + widgets.save_buttons[1] = toolbar_get_widget_by_name("Save"); + widgets.save_buttons[3] = toolbar_get_widget_by_name("SaveAll"); + widgets.redo_items[2] = toolbar_get_widget_by_name("Redo"); + widgets.undo_items[2] = toolbar_get_widget_by_name("Undo"); +} + + +static void init_recent_files(void) +{ + GtkWidget *toolbar_recent_files_menu; + + /* add recent files to the File menu */ + ui_widgets.recent_files_menuitem = ui_lookup_widget(main_widgets.window, "recent_files1"); + ui_widgets.recent_files_menu_menubar = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(ui_widgets.recent_files_menuitem), + ui_widgets.recent_files_menu_menubar); + + /* add recent files to the toolbar Open button */ + toolbar_recent_files_menu = gtk_menu_new(); + g_object_ref(toolbar_recent_files_menu); + geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION( + toolbar_get_action_by_name("Open")), toolbar_recent_files_menu); +} + + void ui_init(void) { - add_stock_items(); + init_recent_files(); ui_widgets.statusbar = ui_lookup_widget(main_widgets.window, "statusbar"); ui_widgets.print_page_setup = ui_lookup_widget(main_widgets.window, "page_setup1"); @@ -1796,19 +1853,15 @@ widgets.menu_insert_include_items[0] = ui_lookup_widget(main_widgets.editor_menu, "insert_include1"); widgets.menu_insert_include_items[1] = ui_lookup_widget(main_widgets.window, "insert_include2"); widgets.save_buttons[0] = ui_lookup_widget(main_widgets.window, "menu_save1"); - widgets.save_buttons[1] = toolbar_get_widget_by_name("Save"); widgets.save_buttons[2] = ui_lookup_widget(main_widgets.window, "menu_save_all1"); - widgets.save_buttons[3] = toolbar_get_widget_by_name("SaveAll"); widgets.redo_items[0] = ui_lookup_widget(main_widgets.editor_menu, "redo1"); widgets.redo_items[1] = ui_lookup_widget(main_widgets.window, "menu_redo2"); - widgets.redo_items[2] = toolbar_get_widget_by_name("Redo"); widgets.undo_items[0] = ui_lookup_widget(main_widgets.editor_menu, "undo1"); widgets.undo_items[1] = ui_lookup_widget(main_widgets.window, "menu_undo2"); - widgets.undo_items[2] = toolbar_get_widget_by_name("Undo"); + ui_init_toolbar_widgets(); init_document_widgets(); create_config_files_menu(); - toolbar_add_config_file_menu_item(); } @@ -1829,7 +1882,6 @@ autosep->ref_count++; else autosep->ref_count--; - auto_separator_update(autosep); } @@ -2024,14 +2076,13 @@ { GList *list = gtk_container_get_children(GTK_CONTAINER(menu)); GList *node; - GtkWidget *child; gint pos; list = g_list_sort(list, compare_menu_item_labels); pos = 0; - foreach_list(child, node, list) + foreach_list(node, list) { - gtk_menu_reorder_child(menu, child, pos); + gtk_menu_reorder_child(menu, node->data, pos); pos++; } g_list_free(list); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/ui_utils.h /tmp/ssBwSf4GIv/geany-0.18/src/ui_utils.h --- geany-0.17/src/ui_utils.h 2009-04-27 20:30:29.000000000 +0100 +++ geany-0.18/src/ui_utils.h 2009-06-20 17:53:28.000000000 +0100 @@ -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.h 3739 2009-04-27 19:30:29Z eht16 $ + * $Id: ui_utils.h 3882 2009-06-20 16:53:28Z eht16 $ */ #ifndef GEANY_UI_UTILS_H @@ -103,10 +103,8 @@ { /* menu widgets */ GtkWidget *toolbar_menu; - GtkWidget *new_file_menu; GtkWidget *recent_files_menuitem; GtkWidget *recent_files_menu_menubar; - GtkWidget *recent_files_menu_toolbar; GtkWidget *print_page_setup; GtkWidget *recent_projects_menuitem; GtkWidget *recent_projects_menu_menubar; @@ -205,6 +203,10 @@ void ui_init(void); +void ui_init_toolbar_widgets(void); + +void ui_init_stock_items(void); + void ui_add_config_file_menu_item(const gchar *real_path, const gchar *label, GtkContainer *parent); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/utils.c /tmp/ssBwSf4GIv/geany-0.18/src/utils.c --- geany-0.17/src/utils.c 2009-04-21 21:52:51.000000000 +0100 +++ geany-0.18/src/utils.c 2009-07-23 17:01:45.000000000 +0100 @@ -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 3718 2009-04-21 20:52:51Z eht16 $ + * $Id: utils.c 4014 2009-07-23 16:01:45Z ntrel $ */ /* @@ -63,7 +63,7 @@ * Tries to open the given URI in a browser. * On Windows, the system's default browser is opened. * On non-Windows systems, the browser command set in the preferences dialog is used. In case - * that fails or it is unset, @a xdg-open is used as fallback as well as some other known + * that fails or it is unset, @c xdg-open is used as fallback as well as some other known * browsers. * * @param uri The URI to open in the web browser. @@ -80,7 +80,7 @@ g_return_if_fail(uri != NULL); - cmdline = g_strconcat(tool_prefs.browser_cmd, " ", uri, NULL); + cmdline = g_strconcat(tool_prefs.browser_cmd, " \"", uri, "\"", NULL); if (! g_spawn_command_line_async(cmdline, NULL)) { const gchar *argv[3]; @@ -214,12 +214,9 @@ /** - * Write the given @c text into a file with @c filename. + * Write 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. Internally, g_file_set_contents() is used - * to write the file with all its error checking and related limitations like - * destroying hard links and possibly losing file permissions. Please read the - * API documentation of g_file_set_contents() for details. + * 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. @@ -229,16 +226,48 @@ **/ gint utils_write_file(const gchar *filename, const gchar *text) { - GError *error = NULL; - g_return_val_if_fail(filename != NULL, ENOENT); g_return_val_if_fail(text != NULL, EINVAL); - if (! g_file_set_contents(filename, text, -1, &error)) + if (file_prefs.use_safe_file_saving) { - geany_debug("%s: could not write to file %s (%s)", G_STRFUNC, filename, error->message); - g_error_free(error); - return EIO; + GError *error = NULL; + if (! g_file_set_contents(filename, text, -1, &error)) + { + geany_debug("%s: could not write to file %s (%s)", G_STRFUNC, filename, error->message); + g_error_free(error); + return EIO; + } + } + else + { + FILE *fp; + gint bytes_written, len; + + if (filename == NULL) + return ENOENT; + + len = strlen(text); + fp = g_fopen(filename, "w"); + if (fp != NULL) + { + bytes_written = fwrite(text, sizeof (gchar), len, fp); + fclose(fp); + + if (len != bytes_written) + { + geany_debug( + "utils_write_file(): written only %d bytes, had to write %d bytes to %s", + bytes_written, len, filename); + return EIO; + } + } + else + { + geany_debug("utils_write_file(): could not write to file %s (%s)", + filename, g_strerror(errno)); + return errno; + } } return 0; } @@ -352,8 +381,8 @@ * * The input strings should be in UTF-8 or locale encoding. * - * @param s1 Pointer to first string or @a NULL. - * @param s2 Pointer to second string or @a NULL. + * @param s1 Pointer to first string or @c NULL. + * @param s2 Pointer to second string or @c NULL. * * @return an integer less than, equal to, or greater than zero if @a s1 is found, respectively, * to be less than, to match, or to be greater than @a s2. @@ -409,7 +438,7 @@ * @param string Input string. * @param truncate_length The length in characters of the resulting string. * - * @return A copy of @c string which is truncated to @c truncate_length characters, + * @return A copy of @a string which is truncated to @a truncate_length characters, * should be freed when no longer needed. * * @since 0.17 @@ -456,13 +485,13 @@ /** - * @a NULL-safe string comparison. Returns @a TRUE if both @c a and @c b are @a NULL - * or if @c a and @c b refer to valid strings which are equal. + * @c NULL-safe string comparison. Returns @c TRUE if both @a a and @a b are @c NULL + * or if @a a and @a b refer to valid strings which are equal. * - * @param a Pointer to first string or @a NULL. - * @param b Pointer to second string or @a NULL. + * @param a Pointer to first string or @c NULL. + * @param b Pointer to second string or @c NULL. * - * @return @a TRUE if @c a equals @c b, else @a FALSE. + * @return @c TRUE if @a a equals @a b, else @c FALSE. **/ gboolean utils_str_equal(const gchar *a, const gchar *b) { @@ -479,7 +508,7 @@ /** - * Remove the extension from @c filename and return the result in a newly allocated string. + * Remove the extension from @a filename and return the result in a newly allocated string. * * @param filename The filename to operate on. * @@ -572,23 +601,23 @@ /* Replaces all occurrences of needle in haystack with replacement. - * Warning: haystack will be freed. - * New code should use utils_string_replace_all() instead (freeing arguments - * is unusual behaviour). + * Warning: *haystack must be a heap address; it may be freed and reassigned. + * Note: utils_string_replace_all() will always be faster when @a replacement is longer + * than @a needle. * All strings have to be NULL-terminated. * See utils_string_replace_all() for details. */ -gchar *utils_str_replace(gchar *haystack, const gchar *needle, const gchar *replacement) +void utils_str_replace_all(gchar **haystack, const gchar *needle, const gchar *replacement) { GString *str; - g_return_val_if_fail(haystack != NULL, NULL); + g_return_if_fail(*haystack != NULL); - str = g_string_new(haystack); + str = g_string_new(*haystack); - g_free(haystack); + g_free(*haystack); utils_string_replace_all(str, needle, replacement); - return g_string_free(str, FALSE); + *haystack = g_string_free(str, FALSE); } @@ -705,10 +734,10 @@ * @param config A GKeyFile object. * @param section The group name to look in for the key. * @param key The key to find. - * @param default_value The default value which will be returned when @c section or @c key + * @param default_value The default value which will be returned when @a section or @a key * don't exist. * - * @return The value associated with c key as an integer, or the given default value if the value + * @return The value associated with @a key as an integer, or the given default value if the value * could not be retrieved. **/ gint utils_get_setting_integer(GKeyFile *config, const gchar *section, const gchar *key, @@ -739,7 +768,7 @@ * @param default_value The default value which will be returned when @c section or @c key * don't exist. * - * @return The value associated with c key as a boolean, or the given default value if the value + * @return The value associated with @a key as a boolean, or the given default value if the value * could not be retrieved. **/ gboolean utils_get_setting_boolean(GKeyFile *config, const gchar *section, const gchar *key, @@ -767,7 +796,7 @@ * @param config A GKeyFile object. * @param section The group name to look in for the key. * @param key The key to find. - * @param default_value The default value which will be returned when @c section or @c key + * @param default_value The default value which will be returned when @a section or @a key * don't exist. * * @return A newly allocated string, either the value for @a key or a copy of the given @@ -807,6 +836,18 @@ } +guint utils_invert_color(guint color) +{ + guint r, g, b; + + r = 0xffffff - color; + g = 0xffffff - (color >> 8); + b = 0xffffff - (color >> 16); + + return (r | (g << 8) | (b << 16)); +} + + /* Get directory from current file in the notebook. * Returns dir string that should be freed or NULL, depending on whether current file is valid. * Returned string is in UTF-8 encoding */ @@ -868,12 +909,12 @@ else { ++u; - while ((val >= KILOBYTE) && (u < zero_and_units + sizeof(zero_and_units) - 1)) + while ((val >= 1024) && (u < zero_and_units + sizeof(zero_and_units) - 1)) { f = fmt_tenths; ++u; - frac = ((((gint)(val % KILOBYTE)) * 10) + (KILOBYTE/2)) / KILOBYTE; - val /= KILOBYTE; + frac = ((((gint)(val % 1024)) * 10) + (1024/2)) / 1024; + val /= 1024; } if (frac >= 10) { /* We need to round up here. */ @@ -887,7 +928,7 @@ } - guint utils_get_value_of_hex(const gchar ch) + static guint utils_get_value_of_hex(const gchar ch) { if (ch >= '0' && ch <= '9') return ch - '0'; @@ -902,7 +943,8 @@ /* utils_strtod() converts a string containing a hex colour ("0x00ff00") into an integer. * Basically, it is the same as strtod() would do, but it does not understand hex colour values, - * before ANSI-C99. With with_route set, it takes strings of the format "#00ff00". */ + * before ANSI-C99. With with_route set, it takes strings of the format "#00ff00". + * Returns -1 on failure. */ gint utils_strtod(const gchar *source, gchar **end, gboolean with_route) { guint red, green, blue, offset = 0; @@ -1305,11 +1347,11 @@ * 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-@a NULL data items in the list, - * unless @a NULL. - * @param error The is the location for storing a possible error, or @a NULL. + * @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 @a NULL if no files found. The list and its data should be + * @return A newly allocated list or @c NULL if no files found. The list and its data should be * freed when no longer needed. **/ GSList *utils_get_file_list(const gchar *path, guint *length, GError **error) @@ -1403,15 +1445,15 @@ /** - * Replaces all occurrences of @c needle in @c haystack with @c replace. + * Replaces all occurrences of @a needle in @a haystack with @a replace. * As of Geany 0.16, @a replace can match @a needle, so the following will work: * @code utils_string_replace_all(text, "\n", "\r\n"); @endcode * * @param haystack The input string to operate on. This string is modified in place. * @param needle The string which should be replaced. - * @param replace The replacement for @c needle. + * @param replace The replacement for @a needle. * - * @return @a amount of replacements done + * @return amount of replacements done **/ guint utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace) { @@ -1420,15 +1462,15 @@ /** - * Convenience function to replace only the first occurrence of @c needle in @c haystack - * with @ replace. + * Convenience function to replace only the first occurrence of @a needle in @a haystack + * with @a replace. * For details, see utils_string_replace_all(). * * @param haystack The input string to operate on. This string is modified in place. * @param needle The string which should be replaced. - * @param replace The replacement for @c needle. + * @param replace The replacement for @a needle. * - * @return @a amount of replacements done + * @return amount of replacements done * * @since 0.16 */ @@ -1486,7 +1528,7 @@ * @param exit_status The child exit status, as returned by waitpid(). * @param error The return location for error or @a NULL. * - * @return @a TRUE on success, @a FALSE if an error was set. + * @return @c TRUE on success, @c FALSE if an error was set. **/ gboolean utils_spawn_sync(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, GSpawnChildSetupFunc child_setup, gpointer user_data, gchar **std_out, @@ -1532,7 +1574,7 @@ * @param child_pid The return location for child process ID, or NULL. * @param error The return location for error or @a NULL. * - * @return @a TRUE on success, @a FALSE if an error was set. + * @return @c TRUE on success, @c FALSE if an error was set. **/ gboolean utils_spawn_async(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, @@ -1560,7 +1602,9 @@ /* Similar to g_build_path() but (re)using a fixed buffer, so never free it. * This assumes a small enough resulting string length to be kept without freeing, - * but this should be the case for filenames. */ + * but this should be the case for filenames. + * @warning As the buffer is reused, you can't call this recursively, e.g. for a + * function argument and within the function called. */ const gchar *utils_build_path(const gchar *first, ...) { static GString *buffer = NULL; @@ -1666,3 +1710,83 @@ } +/* Remove all relative and untidy elements from the path of @a filename. + * @param filename must be a valid absolute path. + * @see tm_get_real_path() - also resolves links. */ +void utils_tidy_path(gchar *filename) +{ + GString *str = g_string_new(filename); + const gchar *c, *needle; + gchar *tmp; + gssize pos; + + g_return_if_fail(g_path_is_absolute(filename)); + + /* 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 ".."; + while (1) + { + c = strstr(str->str, needle); + if (c == NULL) + break; + else + { + pos = c - str->str; + if (pos <= 3) + break; /* bad path */ + + g_string_erase(str, pos, strlen(needle)); /* erase "/.." */ + + tmp = g_strndup(str->str, pos); /* path up to "/.." */ + c = g_strrstr(tmp, G_DIR_SEPARATOR_S); + g_return_if_fail(c); + + pos = c - tmp; /* position of previous "/" */ + g_string_erase(str, pos, strlen(c)); + g_free(tmp); + } + } + g_return_if_fail(strlen(str->str) <= strlen(filename)); + strcpy(filename, str->str); + g_string_free(str, TRUE); +} + + +/* @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. + * + * @param string String to search. + * @param chars Characters to remove. + * + * @return @a string - return value is only useful when nesting function calls, e.g.: + * @code str = utils_str_remove_chars(g_strdup("f_o_o"), "_"); @endcode + * + * @see @c g_strdelimit. + **/ +gchar *utils_str_remove_chars(gchar *string, const gchar *chars) +{ + const gchar *r; + gchar *w = string; + + g_return_val_if_fail(string, NULL); + if (!NZV(chars)) + return string; + + foreach_str(r, string) + { + if (!strchr(chars, *r)) + *w++ = *r; + } + *w = 0x0; + return string; +} + + diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/utils.h /tmp/ssBwSf4GIv/geany-0.18/src/utils.h --- geany-0.17/src/utils.h 2009-04-21 21:52:51.000000000 +0100 +++ geany-0.18/src/utils.h 2009-07-29 18:40:20.000000000 +0100 @@ -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 3718 2009-04-21 20:52:51Z eht16 $ + * $Id: utils.h 4041 2009-07-29 17:40:20Z ntrel $ */ /** @@ -49,23 +49,47 @@ g_free(setptr_tmp);\ } +/** Like glibc's @c strdupa(), but portable. + * Duplicate a string on the stack using @c g_alloca(). + * @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(). */ +#define utils_strdupa(str) \ + strcpy(g_alloca(strlen(str) + 1), str) + +/** Iterates all the items in @a array using pointers. + * @param item pointer to an item in @a array. + * @param array C array to traverse. + * @param len Length of the array. */ #define foreach_c_array(item, array, len) \ for (item = array; item < &array[len]; item++) -/* @param ptr should be a (gpointer*), needed for implementation. */ -#define foreach_ptr_array(item, ptr, ptr_array) \ - for (ptr = ptr_array->pdata, item = *ptr; \ - ptr < &ptr_array->pdata[ptr_array->len]; ++ptr, item = *ptr) - -/* @param node should be a (GSList*), needed for implementation. */ -#define foreach_slist(data_ptr, node, list) \ - for (node = list, data_ptr = node ? node->data : NULL; node != NULL; \ - node = g_slist_next(node), data_ptr = node ? node->data : NULL) - -/* @param node should be a (GList*), needed for implementation. */ -#define foreach_list(data_ptr, node, list) \ - for (node = list, data_ptr = node ? node->data : NULL; node != NULL; \ - node = g_list_next(node), data_ptr = node ? node->data : NULL) +/** Iterates all items in @a array. + * @param type Type of @a item. + * @param item pointer to item in @a array. + * @param array @c GArray to traverse. */ +#define foreach_array(type, item, array) \ + foreach_c_array(item, ((type*)(gpointer)array->data), array->len) + +/** Iterates all the pointers in @a ptr_array. + * @param item pointer in @a ptr_array. + * @param idx @c guint index into @a ptr_array. + * @param ptr_array @c GPtrArray to traverse. */ +#define foreach_ptr_array(item, idx, ptr_array) \ + for (idx = 0, item = g_ptr_array_index(ptr_array, 0); \ + idx < ptr_array->len; ++idx, item = g_ptr_array_index(ptr_array, idx)) + +/** Iterates all the nodes in @a list. + * @param node should be a (@c GList*). + * @param list @c GList to traverse. */ +#define foreach_list(node, list) \ + for (node = list; node != NULL; node = node->next) + +/** Iterates all the nodes in @a list. + * @param node should be a (@c GSList*). + * @param list @c GSList to traverse. */ +#define foreach_slist(node, list) \ + foreach_list(node, list) void utils_open_browser(const gchar *uri); @@ -84,6 +108,8 @@ gboolean utils_atob(const gchar *str); +void utils_tidy_path(gchar *filename); + gboolean utils_is_absolute_path(const gchar *path); const gchar *utils_path_skip_root(const gchar *path); @@ -102,7 +128,7 @@ guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace); -gchar *utils_str_replace(gchar *haystack, const gchar *needle, const gchar *replacement); +void utils_str_replace_all(gchar **haystack, const gchar *needle, const gchar *replacement); gint utils_strpos(const gchar* haystack, const gchar *needle); @@ -118,6 +144,8 @@ gchar *utils_get_hex_from_color(GdkColor *color); +guint utils_invert_color(guint color); + const gchar *utils_get_default_dir_utf8(void); gchar *utils_get_current_file_dir_utf8(void); @@ -177,4 +205,6 @@ gchar *utils_str_middle_truncate(const gchar *string, guint truncate_length); +gchar *utils_str_remove_chars(gchar *string, const gchar *chars); + #endif diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/win32.c /tmp/ssBwSf4GIv/geany-0.18/src/win32.c --- geany-0.17/src/win32.c 2009-03-26 20:10:47.000000000 +0000 +++ geany-0.18/src/win32.c 2009-08-16 18:27:01.000000000 +0100 @@ -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 3654 2009-03-26 20:10:47Z eht16 $ + * $Id: win32.c 4098 2009-08-16 17:27:01Z eht16 $ */ /* @@ -80,11 +80,11 @@ static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile, GError **error); -static gchar *get_file_filters() +static wchar_t *get_file_filters(void) { gchar *string; - gint i, j, len; - + guint i, j, len; + static wchar_t title[1024]; GString *str = g_string_sized_new(100); GString *all_patterns = g_string_sized_new(100); gchar *tmp; @@ -117,14 +117,18 @@ { if (string[i] == '\t') string[i] = '\0'; } - return string; + MultiByteToWideChar(CP_UTF8, 0, string, len, title, sizeof(title)); + g_free(string); + + return title; } -static gchar *get_filters(gboolean project_files) +static wchar_t *get_filters(gboolean project_files) { gchar *string; gint i, len; + static wchar_t title[1024]; if (project_files) { @@ -145,29 +149,31 @@ { if (string[i] == '\t') string[i] = '\0'; } - return string; + MultiByteToWideChar(CP_UTF8, 0, string, len, title, sizeof(title)); + g_free(string); + + return title; } -/* Converts the given UTF-8 filename into something usable for Windows and +/* Converts the given UTF-8 filename or directory name into something usable for Windows and * returns the directory part of the given filename. */ -static gchar *get_dir(const gchar *utf8_filename) +static wchar_t *get_dir_for_path(const gchar *utf8_filename) { + static wchar_t w_dir[MAX_PATH]; gchar *result; - /* don't use utils_get_locale_from_utf8() here because it does only g_strdup() on Windows */ - gchar *locale_filename = g_locale_from_utf8(utf8_filename, -1, NULL, NULL, NULL); - /* g_file_test() needs the UTF-8 name, the resulted string is used with the Windows API - * where we need the locale encoding */ - if (! g_file_test(utf8_filename, G_FILE_TEST_IS_DIR)) - { - result = g_path_get_dirname(locale_filename); - g_free(locale_filename); - } + if (g_file_test(utf8_filename, G_FILE_TEST_IS_DIR)) + result = (gchar*) utf8_filename; else - result = locale_filename; + result = g_path_get_dirname(utf8_filename); - return result; + MultiByteToWideChar(CP_UTF8, 0, result, -1, w_dir, sizeof(w_dir)); + + if (result != utf8_filename) + g_free(result); + + return w_dir; } @@ -180,16 +186,17 @@ switch(uMsg) { case BFFM_INITIALIZED: - SendMessage(hwnd, BFFM_SETSELECTION, TRUE, (LPARAM) pData); + { + SendMessageW(hwnd, BFFM_SETSELECTIONW, TRUE, pData); break; - + } case BFFM_SELCHANGED: { /* set the status window to the currently selected path. */ - static TCHAR szDir[MAX_PATH]; - if (SHGetPathFromIDList((LPITEMIDLIST) lp, szDir)) + static wchar_t szDir[MAX_PATH]; + if (SHGetPathFromIDListW((LPITEMIDLIST) lp, szDir)) { - SendMessage(hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM) szDir); + SendMessageW(hwnd, BFFM_SETSTATUSTEXTW, 0, (LPARAM) szDir); } break; } @@ -204,11 +211,13 @@ gchar *win32_show_project_folder_dialog(GtkWidget *parent, const gchar *title, const gchar *initial_dir) { - BROWSEINFO bi; + BROWSEINFOW bi; LPCITEMIDLIST pidl; - gchar *fname = g_malloc(MAX_PATH); - gchar *dir = get_dir(initial_dir); gchar *result = NULL; + wchar_t fname[MAX_PATH]; + wchar_t w_title[512]; + + MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)); if (parent == NULL) parent = main_widgets.window; @@ -216,31 +225,23 @@ memset(&bi, 0, sizeof bi); bi.hwndOwner = GDK_WINDOW_HWND(parent->window); bi.pidlRoot = NULL; - bi.lpszTitle = title; + bi.lpszTitle = w_title; bi.lpfn = BrowseCallbackProc; - bi.lParam = (LPARAM) dir; + bi.lParam = (LPARAM) get_dir_for_path(initial_dir); bi.ulFlags = BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT; - pidl = SHBrowseForFolder(&bi); - g_free(dir); + pidl = SHBrowseForFolderW(&bi); /* convert the strange Windows folder list item something into an usual path string ;-) */ if (pidl != 0) { - if (SHGetPathFromIDList(pidl, fname)) + if (SHGetPathFromIDListW(pidl, fname)) { - /* Convert the resulting filename into UTF-8 (from whatever encoding it has at - * this moment). Don't use utils_get_utf8_from_locale() here because it does only - * g_strdup() on Windows. */ - setptr(fname, g_locale_to_utf8(fname, -1, NULL, NULL, NULL)); - result = fname; + result = g_malloc0(MAX_PATH * 2); + WideCharToMultiByte(CP_UTF8, 0, fname, -1, result, MAX_PATH * 2, NULL, NULL); } /* SHBrowseForFolder() probably leaks memory here, but how to free the allocated memory? */ } - else - { - g_free(fname); - } return result; } @@ -255,14 +256,16 @@ const gchar *initial_dir, gboolean allow_new_file, gboolean project_file_filter) { - OPENFILENAME of; + OPENFILENAMEW of; gint retval; - gchar *fname = g_malloc(2048); - gchar *filters = get_filters(project_file_filter); - gchar *dir = get_dir(initial_dir); + wchar_t fname[MAX_PATH]; + wchar_t w_title[512]; + gchar *filename; fname[0] = '\0'; + MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)); + if (parent == NULL) parent = main_widgets.window; @@ -274,24 +277,21 @@ of.lStructSize = sizeof of; #endif of.hwndOwner = GDK_WINDOW_HWND(parent->window); - of.lpstrFilter = filters; + of.lpstrFilter = get_filters(project_file_filter); of.lpstrCustomFilter = NULL; of.nFilterIndex = 0; of.lpstrFile = fname; - of.lpstrInitialDir = dir; + of.lpstrInitialDir = get_dir_for_path(initial_dir); of.nMaxFile = 2048; of.lpstrFileTitle = NULL; - of.lpstrTitle = title; - of.lpstrDefExt = ""; + of.lpstrTitle = w_title; + of.lpstrDefExt = L""; of.Flags = OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_HIDEREADONLY; if (! allow_new_file) of.Flags |= OFN_FILEMUSTEXIST; - retval = GetOpenFileName(&of); - - g_free(dir); - g_free(filters); + retval = GetOpenFileNameW(&of); if (! retval) { @@ -302,12 +302,13 @@ win32_message_dialog(NULL, GTK_MESSAGE_ERROR, error); g_free(error); } - g_free(fname); return NULL; } /* convert the resulting filename into UTF-8 (from whatever encoding it has at this moment) */ - setptr(fname, g_locale_to_utf8(fname, -1, NULL, NULL, NULL)); - return fname; + filename = g_malloc0(MAX_PATH * 2); + WideCharToMultiByte(CP_UTF8, 0, fname, -1, filename, MAX_PATH * 2, NULL, NULL); + + return filename; } @@ -315,14 +316,18 @@ * Returns: TRUE if the dialog was not cancelled. */ gboolean win32_show_file_dialog(gboolean file_open, const gchar *initial_dir) { - OPENFILENAME of; + OPENFILENAMEW of; gint retval; - gchar *fname = g_malloc(2048); - gchar *filters = get_file_filters(); + gchar tmp[MAX_PATH]; + wchar_t fname[MAX_PATH]; + wchar_t w_dir[MAX_PATH]; fname[0] = '\0'; - /* initialize file dialog info struct */ + if (initial_dir != NULL) + MultiByteToWideChar(CP_UTF8, 0, initial_dir, -1, w_dir, sizeof(w_dir)); + + /* initialise file dialog info struct */ memset(&of, 0, sizeof of); #ifdef OPENFILENAME_SIZE_VERSION_400 of.lStructSize = OPENFILENAME_SIZE_VERSION_400; @@ -330,29 +335,27 @@ of.lStructSize = sizeof of; #endif of.hwndOwner = GDK_WINDOW_HWND(main_widgets.window->window); - of.lpstrFilter = filters; + of.lpstrFilter = get_file_filters(); of.lpstrCustomFilter = NULL; of.nFilterIndex = GEANY_FILETYPES_NONE + 1; of.lpstrFile = fname; - of.lpstrInitialDir = initial_dir; + of.lpstrInitialDir = (initial_dir != NULL) ? w_dir : NULL; of.nMaxFile = 2048; of.lpstrFileTitle = NULL; of.lpstrTitle = NULL; - of.lpstrDefExt = ""; + of.lpstrDefExt = L""; if (file_open) { of.Flags = OFN_ALLOWMULTISELECT | OFN_FILEMUSTEXIST | OFN_EXPLORER; - retval = GetOpenFileName(&of); + retval = GetOpenFileNameW(&of); } else { of.Flags = OFN_OVERWRITEPROMPT | OFN_PATHMUSTEXIST; - retval = GetSaveFileName(&of); + retval = GetSaveFileNameW(&of); } - g_free(filters); - if (!retval) { if (CommDlgExtendedError()) @@ -361,39 +364,39 @@ g_snprintf(error, sizeof error, "File dialog box error (%x)", (int)CommDlgExtendedError()); win32_message_dialog(NULL, GTK_MESSAGE_ERROR, error); } - g_free(fname); return FALSE; } if (file_open) { - gchar file_name[255]; - gint x; + guint x; x = of.nFileOffset - 1; - if (x != strlen(fname)) + if (x != wcslen(fname)) { /* open a single file */ - - /* convert the resulting filename into UTF-8 */ - setptr(fname, g_locale_to_utf8(fname, -1, NULL, NULL, NULL)); - - document_open_file(fname, of.Flags & OFN_READONLY, NULL, NULL); + 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]) { - gchar *utf8_filename; - if (! fname[x+1]) break; + if (! fname[x+1]) + break; - g_snprintf(file_name, 254, "%s\\%s", fname, fname + x + 1); + 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 */ - utf8_filename = g_locale_to_utf8(file_name, -1, NULL, NULL, NULL); - document_open_file(utf8_filename, of.Flags & OFN_READONLY, NULL, NULL); - g_free(utf8_filename); + document_open_file(file_name, of.Flags & OFN_READONLY, NULL, NULL); } x++; } @@ -402,22 +405,19 @@ else { GeanyDocument *doc = document_get_current(); - /* convert the resulting filename into UTF-8 */ - gchar *utf8 = g_locale_to_utf8(fname, -1, NULL, NULL, NULL); - document_save_file_as(doc, utf8); - g_free(utf8); + WideCharToMultiByte(CP_UTF8, 0, fname, -1, tmp, sizeof(tmp), NULL, NULL); + document_save_file_as(doc, tmp); } - g_free(fname); return (retval != 0); } void win32_show_font_dialog(void) { - CHOOSEFONT cf; gint retval; - static LOGFONT lf; /* logical font structure */ + CHOOSEFONT cf; + LOGFONT lf; /* logical font structure */ memset(&cf, 0, sizeof cf); cf.lStructSize = sizeof cf; @@ -427,17 +427,7 @@ retval = ChooseFont(&cf); - if (!retval) - { - if (CommDlgExtendedError()) - { - /*gchar error[100];*/ - /*snprintf(error, 255, _("Font dialog box error (%x)"), (int)CommDlgExtendedError());*/ - /*MessageBox(NULL, "Font not availab", _("Error"), MB_OK | MB_ICONERROR);*/ - } - return; - } - else + if (retval) { gchar *editorfont = g_strdup_printf("%s %d", lf.lfFaceName, (cf.iPointSize / 10)); ui_set_editor_font(editorfont); @@ -478,21 +468,24 @@ void win32_show_pref_file_dialog(GtkEntry *item) { - OPENFILENAME of; - gint retval; - gchar *fname = g_malloc(512); - gchar **field, *filename, *tmp; - gchar *filters = get_filters(FALSE); + OPENFILENAMEW of; + gint retval, len; + wchar_t fname[MAX_PATH]; + gchar tmp[MAX_PATH]; + gchar **field, *filename; fname[0] = '\0'; /* cut the options from the command line */ field = g_strsplit(gtk_entry_get_text(GTK_ENTRY(item)), " ", 2); - if (field[0] && g_file_test(field[0], G_FILE_TEST_EXISTS)) + if (field[0]) { filename = g_find_program_in_path(field[0]); - strcpy(fname, filename); - g_free(filename); + if (filename != NULL && g_file_test(filename, G_FILE_TEST_EXISTS)) + { + MultiByteToWideChar(CP_UTF8, 0, filename, -1, fname, sizeof(fname)); + g_free(filename); + } } /* initialize file dialog info struct */ @@ -504,21 +497,19 @@ #endif of.hwndOwner = GDK_WINDOW_HWND(ui_widgets.prefs_dialog->window); - of.lpstrFilter = filters; + of.lpstrFilter = get_filters(FALSE); of.lpstrCustomFilter = NULL; of.nFilterIndex = 1; of.lpstrFile = fname; - of.nMaxFile = 512; + of.nMaxFile = 2048; of.lpstrFileTitle = NULL; /*of.lpstrInitialDir = g_get_home_dir();*/ of.lpstrInitialDir = NULL; of.lpstrTitle = NULL; - of.lpstrDefExt = "exe"; + of.lpstrDefExt = L"exe"; of.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_EXPLORER; - retval = GetOpenFileName(&of); - - g_free(filters); + retval = GetOpenFileNameW(&of); if (!retval) { @@ -529,28 +520,24 @@ win32_message_dialog(NULL, GTK_MESSAGE_ERROR, error); } g_strfreev(field); - g_free(fname); return; } - if ((of.nFileOffset - 1) != strlen(fname)) + len = WideCharToMultiByte(CP_UTF8, 0, fname, -1, tmp, sizeof(tmp), NULL, NULL); + if ((of.nFileOffset - 1) != len) { - tmp = g_strdup(fname); if (g_strv_length(field) > 1) /* add the command line args of the old command */ /** TODO this fails badly when the old command contained spaces, we need quoting here */ filename = g_strconcat(tmp, " ", field[1], NULL); else { - filename = tmp; - tmp = NULL; + filename = g_strdup(tmp); } gtk_entry_set_text(GTK_ENTRY(item), filename); g_free(filename); - g_free(tmp); } g_strfreev(field); - g_free(fname); } @@ -618,7 +605,7 @@ /* Little wrapper for _waccess(), returns errno or 0 if there was no error */ gint win32_check_write_permission(const gchar *dir) { - static wchar_t w_dir[512]; + static wchar_t w_dir[MAX_PATH]; MultiByteToWideChar(CP_UTF8, 0, dir, -1, w_dir, sizeof w_dir); if (_waccess(w_dir, R_OK | W_OK) != 0) return errno; @@ -656,6 +643,12 @@ /* 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++; + } ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL); } @@ -762,9 +755,11 @@ if (flags & G_SPAWN_SEARCH_PATH) { - retval = SearchPath(NULL, - argv[0], ".exe", MAX_PATH, buffer, lpPart); - g_snprintf(cmdline, MAX_PATH, "\"%s\"", buffer); + retval = SearchPath(NULL, argv[0], ".exe", MAX_PATH, buffer, lpPart); + if (retval > 0) + g_snprintf(cmdline, MAX_PATH, "\"%s\"", buffer); + else + g_strlcpy(cmdline, argv[0], sizeof(cmdline)); cmdpos = 1; } @@ -782,7 +777,7 @@ gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Second CreateFile failed (%d)", (gint) GetLastError()); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return FALSE; } @@ -796,7 +791,7 @@ gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Second CreateFile failed (%d)", (gint) GetLastError()); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return FALSE; } @@ -818,7 +813,7 @@ gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Stdout pipe creation failed (%d)", (gint) GetLastError()); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); g_free(msg); return FALSE; } @@ -827,12 +822,12 @@ SetHandleInformation(gw_spawn.hChildStdoutRd, HANDLE_FLAG_INHERIT, 0); /* Create a pipe for the child process's STDERR. */ - if (!CreatePipe(&(gw_spawn.hChildStderrRd), &(gw_spawn.hChildStderrWr), &saAttr, 0)) + if (! CreatePipe(&(gw_spawn.hChildStderrRd), &(gw_spawn.hChildStderrWr), &saAttr, 0)) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Stderr pipe creation failed"); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); g_free(msg); return FALSE; } @@ -841,12 +836,12 @@ SetHandleInformation(gw_spawn.hChildStderrRd, HANDLE_FLAG_INHERIT, 0); /* Create a pipe for the child process's STDIN. */ - if (!CreatePipe(&(gw_spawn.hChildStdinRd), &(gw_spawn.hChildStdinWr), &saAttr, 0)) + if (! CreatePipe(&(gw_spawn.hChildStdinRd), &(gw_spawn.hChildStdinWr), &saAttr, 0)) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("win32_spawn: Stdin pipe creation failed"); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); g_free(msg); return FALSE; } @@ -861,7 +856,7 @@ *exit_status = gw_spawn.dwExitCode; } - if (!fSuccess) + if (! fSuccess) { geany_debug("win32_spawn: Create process failed"); if (error != NULL) @@ -873,7 +868,7 @@ if (std_out != NULL) { ReadFromPipe(gw_spawn.hChildStdoutRd, gw_spawn.hChildStdoutWr, hStdoutTempFile, error); - if (!GetContentFromHandle(hStdoutTempFile, &stdout_content, error)) + if (! GetContentFromHandle(hStdoutTempFile, &stdout_content, error)) { return FALSE; } @@ -883,7 +878,7 @@ if (std_err != NULL) { ReadFromPipe(gw_spawn.hChildStderrRd, gw_spawn.hChildStderrWr, hStderrTempFile, error); - if (!GetContentFromHandle(hStderrTempFile, &stderr_content, error)) + if (! GetContentFromHandle(hStderrTempFile, &stderr_content, error)) { return FALSE; } @@ -899,57 +894,69 @@ gchar * buffer; DWORD dwRead; - filesize = GetFileSize(hFile, NULL); + filesize = GetFileSize(hFile, NULL); if (filesize < 1) { *content = NULL; return TRUE; } - buffer = g_malloc(sizeof(gchar*) * (filesize+1)); - if (!buffer) + buffer = g_malloc(filesize + 1); + if (! buffer) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetContentFromHandle: Alloc failed"); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR, msg); + *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR, "%s", msg); g_free(msg); return FALSE; } - SetFilePointer(hFile,0, NULL, FILE_BEGIN); - if (!ReadFile(hFile, buffer, filesize, &dwRead, - NULL) || dwRead == 0) + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + if (! ReadFile(hFile, buffer, filesize, &dwRead, NULL) || dwRead == 0) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetContentFromHandle: Cannot read tempfile"); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); g_free(msg); return FALSE; } - if (!CloseHandle (hFile)) + if (! CloseHandle(hFile)) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetContentFromHandle: CloseHandle failed (%d)", (gint) GetLastError()); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); g_free(msg); g_free(buffer); *content = NULL; return FALSE; } + buffer[filesize] = '\0'; *content = buffer; return TRUE; } +gchar *win32_expand_environment_variables(const gchar *str) +{ + gchar expCmdline[32768]; /* 32768 is the limit for ExpandEnvironmentStrings() */ + + if (ExpandEnvironmentStrings((LPCTSTR) str, (LPTSTR) expCmdline, sizeof(expCmdline)) != 0) + return g_strdup(expCmdline); + else + return g_strdup(str); +} + + static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, const TCHAR *dir, GError **error) { PROCESS_INFORMATION piProcInfo; STARTUPINFO siStartInfo; BOOL bFuncRetn = FALSE; + gchar *expandedCmdline; /* Set up members of the PROCESS_INFORMATION structure. */ ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION) ); @@ -963,9 +970,12 @@ siStartInfo.hStdInput = gw_spawn->hChildStdinRd; siStartInfo.dwFlags |= STARTF_USESTDHANDLES; + /* Expand environment variables like %blah%. */ + expandedCmdline = win32_expand_environment_variables(szCmdline); + /* Create the child process. */ bFuncRetn = CreateProcess(NULL, - szCmdline, /* command line */ + expandedCmdline, /* command line */ NULL, /* process security attributes */ NULL, /* primary thread security attributes */ TRUE, /* handles are inherited */ @@ -975,19 +985,21 @@ &siStartInfo, /* STARTUPINFO pointer */ &piProcInfo); /* receives PROCESS_INFORMATION */ + g_free(expandedCmdline); + if (bFuncRetn == 0) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("CreateChildProcess: CreateProcess failed (%s)", msg); if (*error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, msg); + *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, "%s", msg); g_free(msg); return FALSE; } else { - int i; - DWORD dwStatus; + gint i; + DWORD dwStatus; for (i = 0; i < 2 && (dwStatus = WaitForSingleObject(piProcInfo.hProcess, 30*1000)) == WAIT_TIMEOUT; i++) { @@ -1000,7 +1012,7 @@ gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetExitCodeProcess failed: %s", msg); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, "%s", msg); g_free(msg); } CloseHandle(piProcInfo.hProcess); @@ -1018,12 +1030,12 @@ /* Close the write end of the pipe before reading from the read end of the pipe. */ - if (!CloseHandle(hWrite)) + if (! CloseHandle(hWrite)) { gchar *msg = g_win32_error_message(GetLastError()); geany_debug("ReadFromPipe: Closing handle failed"); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, "%s", msg); g_free(msg); return; } @@ -1031,10 +1043,10 @@ /* Read output from the child process, and write to parent's STDOUT. */ for (;;) { - if( !ReadFile(hRead, chBuf, BUFSIZE, &dwRead, - NULL) || dwRead == 0) break; + if (! ReadFile(hRead, chBuf, BUFSIZE, &dwRead, NULL) || dwRead == 0) + break; - if (!WriteFile(hFile, chBuf, dwRead, &dwWritten, NULL)) + if (! WriteFile(hFile, chBuf, dwRead, &dwWritten, NULL)) break; } } @@ -1059,7 +1071,7 @@ gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetTempFileHandle: GetTempPath failed (%d)", (gint) GetLastError()); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return NULL; } @@ -1074,7 +1086,7 @@ gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetTempFileName failed (%d)", (gint) GetLastError()); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return NULL; } @@ -1092,7 +1104,7 @@ gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetTempFileHandle: Second CreateFile failed (%d)", (gint) GetLastError()); if (error != NULL) - *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, "%s", msg); g_free(msg); return NULL; } diff -Nru /tmp/H5qKeNSrz8/geany-0.17/src/win32.h /tmp/ssBwSf4GIv/geany-0.18/src/win32.h --- geany-0.17/src/win32.h 2009-03-26 20:10:47.000000000 +0000 +++ geany-0.18/src/win32.h 2009-08-02 14:33:39.000000000 +0100 @@ -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 3654 2009-03-26 20:10:47Z eht16 $ + * $Id: win32.h 4050 2009-08-02 13:33:39Z eht16 $ */ @@ -63,4 +63,6 @@ gchar *win32_get_installation_dir(void); +gchar *win32_expand_environment_variables(const gchar *str); + #endif diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/conf.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/conf.c --- geany-0.17/tagmanager/conf.c 2009-03-30 18:49:40.000000000 +0100 +++ geany-0.18/tagmanager/conf.c 2009-06-20 17:51:47.000000000 +0100 @@ -85,6 +85,7 @@ ++cp; } vStringTerminate (name); + vStringStripTrailing (name); while (isspace ((int) *cp)) ++cp; if (*cp == '=') diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/diff.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/diff.c --- geany-0.17/tagmanager/diff.c 2008-02-27 13:17:29.000000000 +0000 +++ geany-0.18/tagmanager/diff.c 2009-07-10 16:57:12.000000000 +0100 @@ -24,11 +24,11 @@ * DATA DEFINITIONS */ typedef enum { - K_FUNCTION + K_FUNCTION } diffKind; static kindOption DiffKinds [] = { - { TRUE, 'f', "function", "functions"} + { TRUE, 'f', "function", "functions"} }; /* @@ -37,32 +37,40 @@ static void findDiffTags (void) { - vString *filename = vStringNew (); - const unsigned char *line, *tmp; + vString *filename = vStringNew (); + const unsigned char *line, *tmp; - while ((line = fileReadLine ()) != NULL) - { + while ((line = fileReadLine ()) != NULL) + { const unsigned char* cp = line; - boolean skipSlash = TRUE; + boolean skipSlash = FALSE; if (strncmp((const char*) cp, "--- ", (size_t) 4) == 0) { cp += 4; if (isspace ((int) *cp)) continue; - tmp = (const unsigned char*) strrchr((const char*) cp, '/'); - if (tmp == NULL) - { /* if no / is contained try \ in case of a Windows filename */ - tmp = (const unsigned char*) strrchr((const char*) cp, '\\'); + /* strip any absolute path */ + if (*cp == '/' || *cp == '\\') + { + skipSlash = TRUE; + tmp = (const unsigned char*) strrchr((const char*) cp, '/'); if (tmp == NULL) - { /* last fallback, probably the filename doesn't contain a path, so take it */ - if (strlen((const char*) cp) > 0) - { - tmp = cp; - skipSlash = FALSE; + { /* if no / is contained try \ in case of a Windows filename */ + tmp = (const unsigned char*) strrchr((const char*) cp, '\\'); + if (tmp == NULL) + { /* last fallback, probably the filename doesn't contain a path, so take it */ + if (strlen((const char*) cp) > 0) + { + tmp = cp; + skipSlash = FALSE; + } } } } + else + tmp = cp; + if (tmp != NULL) { if (skipSlash) tmp++; /* skip the leading slash or backslash */ @@ -77,20 +85,20 @@ } } } - vStringDelete (filename); + vStringDelete (filename); } extern parserDefinition* DiffParser (void) { - static const char *const patterns [] = { "*.diff", "*.patch", NULL }; - static const char *const extensions [] = { "diff", NULL }; - parserDefinition* const def = parserNew ("Diff"); - def->kinds = DiffKinds; - def->kindCount = KIND_COUNT (DiffKinds); - def->patterns = patterns; - def->extensions = extensions; - def->parser = findDiffTags; - return def; + static const char *const patterns [] = { "*.diff", "*.patch", NULL }; + static const char *const extensions [] = { "diff", NULL }; + parserDefinition* const def = parserNew ("Diff"); + def->kinds = DiffKinds; + def->kindCount = KIND_COUNT (DiffKinds); + def->patterns = patterns; + def->extensions = extensions; + def->parser = findDiffTags; + return def; } /* vi:set tabstop=8 shiftwidth=4: */ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/include/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/tagmanager/include/Makefile.in --- geany-0.17/tagmanager/include/Makefile.in 2009-05-02 18:50:13.000000000 +0100 +++ geany-0.18/tagmanager/include/Makefile.in 2009-08-16 18:29:21.000000000 +0100 @@ -80,16 +80,14 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GEANY_DATA_DIR = @GEANY_DATA_DIR@ -GEANY_PIXMAPS_DIR = @GEANY_PIXMAPS_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -109,10 +107,12 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -121,13 +121,18 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -149,7 +154,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -180,6 +185,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/include/tm_source_file.h /tmp/ssBwSf4GIv/geany-0.18/tagmanager/include/tm_source_file.h --- geany-0.17/tagmanager/include/tm_source_file.h 2009-02-24 18:27:01.000000000 +0000 +++ geany-0.18/tagmanager/include/tm_source_file.h 2009-06-10 21:36:21.000000000 +0100 @@ -37,7 +37,7 @@ The TMSourceFile structure is derived from TMWorkObject and contains all it's attributes, plus an integer representing the language of the file. */ -typedef struct _TMSourceFile +typedef struct { TMWorkObject work_object; /*!< The base work object */ langType lang; /*!< Programming language used */ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/include/tm_work_object.h /tmp/ssBwSf4GIv/geany-0.18/tagmanager/include/tm_work_object.h --- geany-0.17/tagmanager/include/tm_work_object.h 2009-02-24 18:27:01.000000000 +0000 +++ geany-0.18/tagmanager/include/tm_work_object.h 2009-06-10 21:36:21.000000000 +0100 @@ -31,12 +31,12 @@ time when the file was analyzed (for caching) and an array of tags which should be populated when the object is analyzed. */ -typedef struct _TMWorkObject +typedef struct TMWorkObject { guint type; /*!< The type of object. Can be a source file or a project */ char *file_name; /*!< Full file name (inc. path) of the work object */ char *short_name; /*!< Just the name of the file (without the path) */ - struct _TMWorkObject *parent; + struct TMWorkObject *parent; time_t analyze_time; /*!< UNUSED Time when the object was last analyzed */ GPtrArray *tags_array; /*!< Tags obtained by parsing the object */ } TMWorkObject; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/include/tm_workspace.h /tmp/ssBwSf4GIv/geany-0.18/tagmanager/include/tm_workspace.h --- geany-0.17/tagmanager/include/tm_workspace.h 2008-10-27 19:17:28.000000000 +0000 +++ geany-0.18/tagmanager/include/tm_workspace.h 2009-06-21 22:19:43.000000000 +0100 @@ -28,11 +28,11 @@ created. This contains global tags gleaned from /usr/include, etc. and should be used for autocompletion, calltips, etc. */ -typedef struct _TMWorkspace +typedef struct { - TMWorkObject work_object; /*!< The parent work object */ - GPtrArray *global_tags; /*!< Global tags loaded at startup */ - GPtrArray *work_objects; /*!< An array of TMWorkObject pointers */ + TMWorkObject work_object; /*!< The parent work object */ + GPtrArray *global_tags; /*!< Global tags loaded at startup */ + GPtrArray *work_objects; /*!< An array of TMWorkObject pointers */ } TMWorkspace; /* Since TMWorkspace is a singleton, you should not create multiple @@ -63,11 +63,11 @@ /*! Removes a member object from the workspace if it exists. \param work_object Pointer to the work object to be removed. - \param free Whether the work object is to be freed as well. + \param do_free Whether the work object is to be freed as well. \param update Whether to update workspace objects. \return TRUE on success, FALSE on failure (e.g. the work object does not exist). */ -gboolean tm_workspace_remove_object(TMWorkObject *work_object, gboolean free, gboolean update); +gboolean tm_workspace_remove_object(TMWorkObject *work_object, gboolean do_free, gboolean update); /* Loads the global tag list from the specified file. The global tag list should have been first created using tm_workspace_create_global_tags(). @@ -90,7 +90,7 @@ \return TRUE on success, FALSE on failure. */ gboolean tm_workspace_create_global_tags(const char *config_dir, const char *pre_process, - const char **includes, int includes_count, const char *tags_file, int lang); + const char **includes, int includes_count, const char *tags_file, int lang); /* Recreates the tag array of the workspace by collecting the tags of all member work objects. You shouldn't have to call this directly since @@ -137,7 +137,20 @@ */ const GPtrArray * tm_workspace_find_scoped (const char *name, const char *scope, gint type, - TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); + TMTagAttrType *attrs, gboolean partial, langType lang, gboolean global_search); + +/* Returns all matching members tags found in given struct/union/class name. + \param name Name of the struct/union/class. + \param file_tags A GPtrArray of edited file TMTag pointers (for search speedup, can be NULL). + \return A GPtrArray of TMTag pointers to struct/union/class members */ +const GPtrArray *tm_workspace_find_scope_members(const GPtrArray *file_tags, + const char *scope_name, + gboolean find_global, + gboolean no_definitions); + +const GPtrArray * +tm_workspace_find_namespace_members (const GPtrArray * file_tags, const char *name, + gboolean search_global); /* Returns TMTag to function which "own" given line \param line Current line in edited file. diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/lua.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/lua.c --- geany-0.17/tagmanager/lua.c 2007-12-04 15:44:45.000000000 +0000 +++ geany-0.18/tagmanager/lua.c 2009-07-04 10:17:32.000000000 +0100 @@ -1,5 +1,5 @@ /* -* $Id: lua.c 2089 2007-12-04 15:44:45Z eht16 $ +* $Id: lua.c 3909 2009-07-04 09:17:32Z eht16 $ * * Copyright (c) 2000-2001, Max Ischenko . * @@ -110,7 +110,7 @@ p = p + 9; /* skip the `function' word */ q = strchr ((const char*) p, '('); extract_name (p, q, name); - } else { + } else if (*(q+1) != '=') { /* ignore `if type(v) == "function" then ...' */ p = (const char*) &line[0]; extract_name (p, q, name); } diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/Makefile.am /tmp/ssBwSf4GIv/geany-0.18/tagmanager/Makefile.am --- geany-0.17/tagmanager/Makefile.am 2009-04-21 21:52:19.000000000 +0100 +++ geany-0.18/tagmanager/Makefile.am 2009-07-30 12:29:53.000000000 +0100 @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -# $Id: Makefile.am 3716 2009-04-21 20:52:19Z eht16 $ +# $Id: Makefile.am 4046 2009-07-30 11:29:53Z ntrel $ SUBDIRS = include INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) @@ -28,6 +28,7 @@ entry.h\ get.h\ main.h\ + nestlevel.h\ read.h\ parse.h\ strlist.h\ @@ -50,6 +51,7 @@ latex.c\ lregex.c\ matlab.c\ + markdown.c\ pascal.c\ perl.c\ rest.c\ @@ -66,6 +68,7 @@ entry.c\ get.c\ keyword.c\ + nestlevel.c\ options.h\ options.c\ parse.c\ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/Makefile.in /tmp/ssBwSf4GIv/geany-0.18/tagmanager/Makefile.in --- geany-0.17/tagmanager/Makefile.in 2009-05-02 18:50:13.000000000 +0100 +++ geany-0.18/tagmanager/Makefile.in 2009-08-16 18:29:21.000000000 +0100 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 3716 2009-04-21 20:52:19Z eht16 $ +# $Id: Makefile.am 4046 2009-07-30 11:29:53Z ntrel $ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -48,32 +48,34 @@ 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 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 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 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 + 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 @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) 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) keyword.$(OBJEXT) \ - options.$(OBJEXT) parse.$(OBJEXT) read.$(OBJEXT) \ - sort.$(OBJEXT) strlist.$(OBJEXT) vstring.$(OBJEXT) \ - tm_workspace.$(OBJEXT) tm_work_object.$(OBJEXT) \ - tm_source_file.$(OBJEXT) tm_project.$(OBJEXT) tm_tag.$(OBJEXT) \ - tm_symbol.$(OBJEXT) tm_file_entry.$(OBJEXT) \ - tm_tagmanager.$(OBJEXT) $(am__objects_1) + 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) \ + keyword.$(OBJEXT) nestlevel.$(OBJEXT) options.$(OBJEXT) \ + parse.$(OBJEXT) read.$(OBJEXT) sort.$(OBJEXT) \ + strlist.$(OBJEXT) vstring.$(OBJEXT) tm_workspace.$(OBJEXT) \ + tm_work_object.$(OBJEXT) tm_source_file.$(OBJEXT) \ + tm_project.$(OBJEXT) tm_tag.$(OBJEXT) tm_symbol.$(OBJEXT) \ + tm_file_entry.$(OBJEXT) tm_tagmanager.$(OBJEXT) \ + $(am__objects_1) libtagmanager_a_OBJECTS = $(am_libtagmanager_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -126,16 +128,14 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GEANY_DATA_DIR = @GEANY_DATA_DIR@ -GEANY_PIXMAPS_DIR = @GEANY_PIXMAPS_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -155,10 +155,12 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -167,13 +169,18 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -195,7 +202,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -226,6 +233,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -262,6 +270,7 @@ entry.h\ get.h\ main.h\ + nestlevel.h\ read.h\ parse.h\ strlist.h\ @@ -284,6 +293,7 @@ latex.c\ lregex.c\ matlab.c\ + markdown.c\ pascal.c\ perl.c\ rest.c\ @@ -300,6 +310,7 @@ entry.c\ get.c\ keyword.c\ + nestlevel.c\ options.h\ options.c\ parse.c\ @@ -386,7 +397,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lregex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markdown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matlab.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nestlevel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nsis.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/makefile.win32 /tmp/ssBwSf4GIv/geany-0.18/tagmanager/makefile.win32 --- geany-0.17/tagmanager/makefile.win32 2009-04-21 21:52:19.000000000 +0100 +++ geany-0.18/tagmanager/makefile.win32 2009-07-30 12:29:53.000000000 +0100 @@ -41,8 +41,9 @@ $(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 \ 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 options.o \ -parse.o basic.o read.o sort.o strlist.o latex.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o css.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 \ 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 $(AR) rc $@ $^ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/markdown.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/markdown.c --- geany-0.17/tagmanager/markdown.c 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/tagmanager/markdown.c 2009-07-30 12:29:53.000000000 +0100 @@ -0,0 +1,105 @@ +/* +* +* Copyright (c) 2009, 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 Markdown 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 MarkdownKinds[] = { + { TRUE, 'v', "variable", "sections" } +}; + +/* +* 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 makeMarkdownTag (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 = "variable"; + e.kind = 'v'; + + makeTagEntry(&e); +} + + +static void findMarkdownTags (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)) + { + makeMarkdownTag(name, TRUE); + } + else if (line[0] == '#') { + vStringClear(name); + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeMarkdownTag(name, FALSE); + } + else { + vStringClear (name); + if (! isspace(*line)) + vStringCatS(name, (const char*) line); + vStringTerminate(name); + } + } + vStringDelete (name); +} + +extern parserDefinition* MarkdownParser (void) +{ + static const char *const patterns [] = { "*.md", NULL }; + static const char *const extensions [] = { "md", NULL }; + parserDefinition* const def = parserNew ("Markdown"); + + def->kinds = MarkdownKinds; + def->kindCount = KIND_COUNT (MarkdownKinds); + def->patterns = patterns; + def->extensions = extensions; + def->parser = findMarkdownTags; + return def; +} + diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/nestlevel.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/nestlevel.c --- geany-0.17/tagmanager/nestlevel.c 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/tagmanager/nestlevel.c 2009-05-12 16:55:13.000000000 +0100 @@ -0,0 +1,78 @@ +/* +* $Id: nestlevel.c 3788 2009-05-12 15:55:13Z ntrel $ +* +* Copyright (c) 1999-2002, Darren Hiebert +* Copyright 2009 Nick Treleaven +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* Defines external interface to scope nesting levels for tags. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include "main.h" +#include "nestlevel.h" + +/* +* FUNCTION DEFINITIONS +*/ + +extern NestingLevels *nestingLevelsNew(void) +{ + NestingLevels *nls = xCalloc (1, NestingLevels); + return nls; +} + +extern void nestingLevelsFree(NestingLevels *nls) +{ + int i; + for (i = 0; i < nls->allocated; i++) + vStringDelete(nls->levels[i].name); + if (nls->levels) eFree(nls->levels); + eFree(nls); +} + +extern void nestingLevelsPush(NestingLevels *nls, + const vString *name, int type) +{ + NestingLevel *nl = NULL; + + if (nls->n >= nls->allocated) + { + nls->allocated++; + nls->levels = xRealloc(nls->levels, + nls->allocated, NestingLevel); + nls->levels[nls->n].name = vStringNew(); + } + nl = &nls->levels[nls->n]; + nls->n++; + + vStringCopy(nl->name, name); + nl->type = type; +} + +extern void nestingLevelsPop(NestingLevels *nls) +{ + const NestingLevel *nl = nestingLevelsGetCurrent(nls); + + Assert (nl != NULL); + vStringClear(nl->name); + nls->n--; +} + +extern NestingLevel *nestingLevelsGetCurrent(NestingLevels *nls) +{ + Assert (nls != NULL); + + if (nls->n < 1) + return NULL; + + return &nls->levels[nls->n - 1]; +} + +/* vi:set tabstop=4 shiftwidth=4: */ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/nestlevel.h /tmp/ssBwSf4GIv/geany-0.18/tagmanager/nestlevel.h --- geany-0.17/tagmanager/nestlevel.h 1970-01-01 01:00:00.000000000 +0100 +++ geany-0.18/tagmanager/nestlevel.h 2009-05-12 16:55:13.000000000 +0100 @@ -0,0 +1,54 @@ +/* +* $Id: nestlevel.h 3788 2009-05-12 15:55:13Z ntrel $ +* +* Copyright (c) 1999-2002, Darren Hiebert +* Copyright 2009 Nick Treleaven +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* Defines external interface to scope nesting levels for tags. +*/ +#ifndef _NESTLEVEL_H +#define _NESTLEVEL_H + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include "vstring.h" + +/* +* DATA DECLARATIONS +*/ +typedef struct NestingLevel NestingLevel; +typedef struct NestingLevels NestingLevels; + +struct NestingLevel +{ + int indentation; + vString *name; + int type; +}; + +struct NestingLevels +{ + NestingLevel *levels; + int n; /* number of levels in use */ + int allocated; +}; + +/* +* FUNCTION PROTOTYPES +*/ +extern NestingLevels *nestingLevelsNew(void); +extern void nestingLevelsFree(NestingLevels *nls); +extern void nestingLevelsPush(NestingLevels *nls, + const vString *name, int type); +extern void nestingLevelsPop(NestingLevels *nls); +extern NestingLevel *nestingLevelsGetCurrent(NestingLevels *nls); + +#endif /* _NESTLEVEL_H */ + +/* vi:set tabstop=4 shiftwidth=4: */ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/parsers.h /tmp/ssBwSf4GIv/geany-0.18/tagmanager/parsers.h --- geany-0.17/tagmanager/parsers.h 2009-04-21 21:52:19.000000000 +0100 +++ geany-0.18/tagmanager/parsers.h 2009-07-30 12:29:53.000000000 +0100 @@ -50,8 +50,8 @@ MatlabParser, \ ValaParser, \ ActionScriptParser, \ - NsisParser - + NsisParser, \ + MarkdownParser /* langType of each parser 0 CParser @@ -90,6 +90,7 @@ 33 ValaParser 34 ActionScriptParser 35 NsisParser +36 MarkdownParser */ #endif /* _PARSERS_H */ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/pascal.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/pascal.c --- geany-0.17/tagmanager/pascal.c 2006-08-22 20:15:33.000000000 +0100 +++ geany-0.18/tagmanager/pascal.c 2009-06-12 13:21:29.000000000 +0100 @@ -1,5 +1,5 @@ /* -* $Id: pascal.c 756 2006-08-22 19:15:33Z eht16 $ +* $Id: pascal.c 3860 2009-06-12 12:21:29Z ntrel $ * * Copyright (c) 2001-2002, Darren Hiebert * @@ -20,6 +20,7 @@ #include "entry.h" #include "parse.h" #include "read.h" +#include "main.h" #include "vstring.h" /* @@ -30,7 +31,7 @@ } pascalKind; static kindOption PascalKinds [] = { - { TRUE, 'f', "function", "functions"}, + { TRUE, 'f', "function", "functions"}, { TRUE, 'f', "function", "procedures"} }; @@ -39,7 +40,8 @@ */ static void createPascalTag (tagEntryInfo* const tag, - const vString* const name, const int kind) + const vString* const name, const int kind, + const char *arglist, const char *vartype) { if (PascalKinds [kind].enabled && name != NULL && vStringLength (name) > 0) { @@ -47,6 +49,8 @@ tag->kindName = PascalKinds [kind].name; tag->kind = PascalKinds [kind].letter; + tag->extensionFields.arglist = arglist; + tag->extensionFields.varType = vartype; } else initTagEntry (tag, NULL); @@ -79,6 +83,69 @@ return result; } +static void parseArglist(const char *buf, char **arglist, char **vartype) +{ + char *c, *start, *end; + int level; + + if (NULL == buf || NULL == arglist) + return; + + c = strdup(buf); + /* parse argument list which can be missing like in "function ginit:integer;" */ + if (NULL != (start = strchr(c, '('))) + { + for (level = 1, end = start + 1; level > 0; ++end) + { + if ('\0' == *end) + break; + else if ('(' == *end) + ++ level; + else if (')' == *end) + -- level; + } + } + else /* if no argument list was found, continue looking for a return value */ + { + start = "()"; + end = c; + } + + /* parse return type if requested by passing a non-NULL vartype argument */ + if (NULL != vartype) + { + char *var, *var_start; + + *vartype = NULL; + + if (NULL != (var = strchr(end, ':'))) + { + var++; /* skip ':' */ + while (isspace((int) *var)) + ++var; + + if (starttoken(*var)) + { + var_start = var; + var++; + while (intoken(*var)) + var++; + if (endtoken(*var)) + { + *var = '\0'; + *vartype = strdup(var_start); + } + } + } + } + + *end = '\0'; + *arglist = strdup(start); + + eFree(c); +} + + /* Algorithm adapted from from GNU etags. * Locates tags for procedures & functions. Doesn't do any type- or * var-definitions. It does look for the keyword "extern" or "forward" @@ -89,6 +156,8 @@ { vString *name = vStringNew (); tagEntryInfo tag; + char *arglist = NULL; + char *vartype = NULL; pascalKind kind = K_FUNCTION; /* each of these flags is TRUE iff: */ boolean incomment = FALSE; /* point is inside a comment */ @@ -187,6 +256,14 @@ verify_tag = FALSE; } } + else if (tolower ((int) *dbp) == 't') + { + if (tail ("type")) /* check for forward reference */ + { + found_tag = FALSE; + verify_tag = FALSE; + } + } if (found_tag && verify_tag) /* not external proc, so make tag */ { found_tag = FALSE; @@ -208,7 +285,11 @@ for (cp = dbp ; *cp != '\0' && !endtoken (*cp) ; cp++) continue; vStringNCopyS (name, (const char*) dbp, cp - dbp); - createPascalTag (&tag, name, kind); + eFree(arglist); + if (kind == K_FUNCTION) + eFree(vartype); + parseArglist((const char*) cp, &arglist, (kind == K_FUNCTION) ? &vartype : NULL); + createPascalTag (&tag, name, kind, arglist, (kind == K_FUNCTION) ? vartype : NULL); dbp = cp; /* set dbp to e-o-token */ get_tagname = FALSE; found_tag = TRUE; @@ -254,8 +335,11 @@ } break; } - } /* while not eof */ + } /* while not eof */ } + eFree(arglist); + eFree(vartype); + vStringDelete(name); } extern parserDefinition* PascalParser (void) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/python.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/python.c --- geany-0.17/tagmanager/python.c 2008-06-15 18:50:07.000000000 +0100 +++ geany-0.18/tagmanager/python.c 2009-06-01 16:41:24.000000000 +0100 @@ -1,5 +1,5 @@ /* -* $Id: python.c 2694 2008-06-15 17:50:07Z eht16 $ +* $Id: python.c 3831 2009-06-01 15:41:24Z ntrel $ * * Copyright (c) 2000-2003, Darren Hiebert * @@ -21,36 +21,21 @@ #include "read.h" #include "main.h" #include "vstring.h" +#include "nestlevel.h" /* * DATA DEFINITIONS */ typedef enum { - K_CLASS, K_FUNCTION, K_MEMBER, K_VARIABLE + K_CLASS, K_FUNCTION, K_MEMBER, K_VARIABLE, K_IMPORT } pythonKind; static kindOption PythonKinds[] = { {TRUE, 'c', "class", "classes"}, {TRUE, 'f', "function", "functions"}, {TRUE, 'm', "member", "class members"}, - {TRUE, 'v', "variable", "variables"} -}; - -typedef struct NestingLevel NestingLevel; -typedef struct NestingLevels NestingLevels; - -struct NestingLevel -{ - int indentation; - vString *name; - boolean is_class; -}; - -struct NestingLevels -{ - NestingLevel *levels; - int n; - int allocated; + {TRUE, 'v', "variable", "variables"}, + {TRUE, 'i', "namespace", "imports"} }; static char const * const singletriple = "'''"; @@ -76,13 +61,14 @@ * extract all relevant information and create a tag. */ static void makeFunctionTag (vString *const function, - vString *const parent, int is_class_parent) + vString *const parent, int is_class_parent, const char *arglist) { tagEntryInfo tag; initTagEntry (&tag, vStringValue (function)); tag.kindName = "function"; tag.kind = 'f'; + tag.extensionFields.arglist = arglist; if (vStringLength (parent) > 0) { @@ -204,7 +190,8 @@ while (*cp) { cp = skipEverything (cp); - if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5)) + if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5) || + !strncmp(cp, "cdef", 4) || !strncmp(cp, "cpdef", 5)) { return cp; } @@ -262,11 +249,82 @@ vStringDelete (inheritance); } +static void parseImports (const char *cp) +{ + const char *pos; + vString *name, *name_next; + + cp = skipEverything (cp); + + if ((pos = strstr (cp, "import")) == NULL) + return; + + cp = pos + 6; + + /* continue only if there is some space between the keyword and the identifier */ + if (! isspace (*cp)) + return; + + cp++; + cp = skipSpace (cp); + + name = vStringNew (); + name_next = vStringNew (); + + cp = skipEverything (cp); + while (*cp) + { + cp = parseIdentifier (cp, name); + + cp = skipEverything (cp); + /* we parse the next possible import statement as well to be able to ignore 'foo' in + * 'import foo as bar' */ + parseIdentifier (cp, name_next); + + /* take the current tag only if the next one is not "as" */ + if (strcmp (vStringValue (name_next), "as") != 0 && + strcmp (vStringValue (name), "as") != 0) + { + makeSimpleTag (name, PythonKinds, K_IMPORT); + } + } + vStringDelete (name); + vStringDelete (name_next); +} + +/* modified from get.c getArglistFromStr(). + * warning: terminates rest of string past arglist! + * note: does not ignore brackets inside strings! */ +static char *parseArglist(const char *buf) +{ + char *start, *end; + int level; + if (NULL == buf) + return NULL; + if (NULL == (start = strchr(buf, '('))) + return NULL; + for (level = 1, end = start + 1; level > 0; ++end) + { + if ('\0' == *end) + break; + else if ('(' == *end) + ++ level; + else if (')' == *end) + -- level; + } + *end = '\0'; + return strdup(start); +} + static void parseFunction (const char *cp, vString *const def, vString *const parent, int is_class_parent) { + char *arglist; + cp = parseIdentifier (cp, def); - makeFunctionTag (def, parent, is_class_parent); + arglist = parseArglist (cp); + makeFunctionTag (def, parent, is_class_parent, arglist); + eFree (arglist); } /* Get the combined name of a nested symbol. Classes are separated with ".", @@ -294,13 +352,16 @@ break; if (prev) { - if (prev->is_class) + vStringCatS(result, "."); /* make Geany symbol list grouping work properly */ +/* + if (prev->type == K_CLASS) vStringCatS(result, "."); else vStringCatS(result, "/"); +*/ } vStringCat(result, nl->name); - is_class = nl->is_class; + is_class = (nl->type == K_CLASS); prev = nl; } return is_class; @@ -330,27 +391,8 @@ } } -static NestingLevels *newNestingLevels(void) -{ - NestingLevels *nls = xCalloc (1, NestingLevels); - return nls; -} - -static void freeNestingLevels(NestingLevels *nls) -{ - int i; - for (i = 0; i < nls->allocated; i++) - vStringDelete(nls->levels[i].name); - if (nls->levels) eFree(nls->levels); - eFree(nls); -} - -/* TODO: This is totally out of place in python.c, but strlist.h is not usable. - * Maybe should just move these three functions to a separate file, even if no - * other parser uses them. - */ static void addNestingLevel(NestingLevels *nls, int indentation, - vString *name, boolean is_class) + const vString *name, boolean is_class) { int i; NestingLevel *nl = NULL; @@ -362,20 +404,16 @@ } if (i == nls->n) { - if (i >= nls->allocated) - { - nls->allocated++; - nls->levels = xRealloc(nls->levels, - nls->allocated, NestingLevel); - nls->levels[i].name = vStringNew(); - } + nestingLevelsPush(nls, name, 0); nl = nls->levels + i; } - nls->n = i + 1; - - vStringCopy(nl->name, name); + else + { /* reuse existing slot */ + nls->n = i + 1; + vStringCopy(nl->name, name); + } nl->indentation = indentation; - nl->is_class = is_class; + nl->type = is_class ? K_CLASS : !K_CLASS; } /* Return a pointer to the start of the next triple string, or NULL. Store @@ -442,8 +480,8 @@ { if (*eq == '=') return NULL; /* ignore '==' operator and 'x=5,y=6)' function lines */ - if (*eq == '(') - break; /* allow 'x = func(b=2,y=2,' lines */ + if (*eq == '(' || *eq == '#') + break; /* allow 'x = func(b=2,y=2,' lines and comments at the end of line */ eq++; } @@ -465,13 +503,44 @@ return start; } +/* Skip type declaration that optionally follows a cdef/cpdef */ +static const char *skipTypeDecl (const char *cp, boolean *is_class) +{ + const char *lastStart = cp, *ptr = cp; + int loopCount = 0; + ptr = skipSpace(cp); + if (!strncmp("extern", ptr, 6)) { + ptr += 6; + ptr = skipSpace(ptr); + if (!strncmp("from", ptr, 4)) { return NULL; } + } + if (!strncmp("class", ptr, 5)) { + ptr += 5 ; + *is_class = TRUE; + ptr = skipSpace(ptr); + return ptr; + } + /* limit so that we don't pick off "int item=obj()" */ + while (*ptr && loopCount++ < 2) { + while (*ptr && *ptr != '=' && *ptr != '(' && !isspace(*ptr)) ptr++; + if (!*ptr || *ptr == '=') return NULL; + if (*ptr == '(') { + return lastStart; /* if we stopped on a '(' we are done */ + } + ptr = skipSpace(ptr); + lastStart = ptr; + while (*lastStart == '*') lastStart++; /* cdef int *identifier */ + } + return NULL; +} + static void findPythonTags (void) { vString *const continuation = vStringNew (); vString *const name = vStringNew (); vString *const parent = vStringNew(); - NestingLevels *const nesting_levels = newNestingLevels(); + NestingLevels *const nesting_levels = nestingLevelsNew(); const char *line; int line_skip = 0; @@ -479,7 +548,7 @@ while ((line = (const char *) fileReadLine ()) != NULL) { - const char *cp = line; + const char *cp = line, *candidate; char const *longstring; char const *keyword, *variable; int indent; @@ -545,6 +614,27 @@ found = TRUE; is_class = TRUE; } + else if (!strncmp (keyword, "cdef ", 5)) + { + cp = skipSpace(keyword + 4); + candidate = skipTypeDecl (cp, &is_class); + if (candidate) + { + found = TRUE; + cp = candidate; + } + + } + else if (!strncmp (keyword, "cpdef ", 6)) + { + cp = skipSpace(keyword + 5); + candidate = skipTypeDecl (cp, &is_class); + if (candidate) + { + found = TRUE; + cp = candidate; + } + } if (found) { @@ -583,17 +673,19 @@ makeVariableTag (name, parent); } + /* Find and parse imports */ + parseImports(line); } /* Clean up all memory we allocated. */ vStringDelete (parent); vStringDelete (name); vStringDelete (continuation); - freeNestingLevels (nesting_levels); + nestingLevelsFree (nesting_levels); } extern parserDefinition *PythonParser (void) { - static const char *const extensions[] = { "py", "pyx", "pxd", "scons", "python", NULL }; + static const char *const extensions[] = { "py", "pyx", "pxd", "pxi" ,"scons", NULL }; parserDefinition *def = parserNew ("Python"); def->kinds = PythonKinds; def->kindCount = KIND_COUNT (PythonKinds); diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/rest.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/rest.c --- geany-0.17/tagmanager/rest.c 2009-01-04 18:30:42.000000000 +0000 +++ geany-0.18/tagmanager/rest.c 2009-05-12 16:55:13.000000000 +0100 @@ -19,6 +19,7 @@ #include "parse.h" #include "read.h" #include "vstring.h" +#include "nestlevel.h" /* * DATA DEFINITIONS @@ -40,24 +41,48 @@ static char kindchars[SECTION_COUNT]; +static NestingLevels *nestingLevels = NULL; + /* * FUNCTION DEFINITIONS */ -static void makeRestTag (const vString* const name, - kindOption* const kinds, const int kind) +static NestingLevel *getNestingLevel(const int kind) +{ + NestingLevel *nl; + + while (1) + { + nl = nestingLevelsGetCurrent(nestingLevels); + if (nl && nl->type >= kind) + nestingLevelsPop(nestingLevels); + else + break; + } + return nl; +} + +static void makeRestTag (const vString* const name, const int kind) { - if (name != NULL && vStringLength (name) > 0) + const NestingLevel *const nl = getNestingLevel(kind); + + if (vStringLength (name) > 0) { tagEntryInfo e; initTagEntry (&e, vStringValue (name)); e.lineNumber--; /* we want the line before the '---' underline chars */ - e.kindName = kinds [kind].name; - e.kind = kinds [kind].letter; + e.kindName = RestKinds [kind].name; + e.kind = RestKinds [kind].letter; + if (nl && nl->type < kind) + { + e.extensionFields.scope [0] = RestKinds [nl->type].name; + e.extensionFields.scope [1] = vStringValue (nl->name); + } makeTagEntry (&e); } + nestingLevelsPush(nestingLevels, name, kind); } @@ -105,6 +130,7 @@ const unsigned char *line; memset(kindchars, 0, sizeof kindchars); + nestingLevels = nestingLevelsNew(); while ((line = fileReadLine ()) != NULL) { @@ -120,7 +146,7 @@ if (kind >= 0) { - makeRestTag(name, RestKinds, kind); + makeRestTag(name, kind); continue; } } @@ -130,6 +156,7 @@ vStringTerminate(name); } vStringDelete (name); + nestingLevelsFree(nestingLevels); } extern parserDefinition* RestParser (void) diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/tcl.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/tcl.c --- geany-0.17/tagmanager/tcl.c 2008-08-05 09:54:02.000000000 +0100 +++ geany-0.18/tagmanager/tcl.c 2009-06-28 11:42:34.000000000 +0100 @@ -1,5 +1,5 @@ /* -* $Id: tcl.c 2856 2008-08-05 08:54:02Z eht16 $ +* $Id: tcl.c 3900 2009-06-28 10:42:34Z eht16 $ * * Copyright (c) 2000-2003, Darren Hiebert * @@ -24,13 +24,14 @@ * DATA DEFINITIONS */ typedef enum { - K_CLASS, K_METHOD, K_PROCEDURE + K_CLASS, K_METHOD, K_PROCEDURE, K_MODULE } tclKind; static kindOption TclKinds [] = { { TRUE, 'c', "class", "classes" }, - { TRUE, 'm', "member", "methods" }, - { TRUE, 'p', "function", "procedures" } + { TRUE, 'f', "member", "methods" }, + { TRUE, 'p', "function", "procedures" }, + { TRUE, 'm', "namespace", "modules" } }; /* @@ -107,6 +108,29 @@ cp = makeTclTag (cp, name, K_METHOD); } } + else if (match (line, "method")) + { + cp = makeTclTag (cp, name, K_METHOD); + } + else if (match (line, "oo::class") ) { + if (match (cp, "create")) + { + cp += 6; + while (isspace ((int) *cp)) + ++cp; + cp = makeTclTag (cp, name, K_CLASS); + } + } + else if (match (line, "namespace") ) { + if (match (cp, "eval")) + { + cp += 4; + while (isspace ((int) *cp)) + ++cp; + cp = makeTclTag (cp, name, K_MODULE); + } + } + } vStringDelete (name); } diff -Nru /tmp/H5qKeNSrz8/geany-0.17/tagmanager/tm_workspace.c /tmp/ssBwSf4GIv/geany-0.18/tagmanager/tm_workspace.c --- geany-0.17/tagmanager/tm_workspace.c 2009-02-24 18:27:01.000000000 +0000 +++ geany-0.18/tagmanager/tm_workspace.c 2009-06-10 13:36:13.000000000 +0100 @@ -257,22 +257,6 @@ } } -static gint get_global_tag_type_mask(gint lang) -{ - switch (lang) - { - case 0: - case 1: - /* C/C++ */ - return tm_tag_class_t | tm_tag_typedef_t | tm_tag_enum_t | tm_tag_enumerator_t | - tm_tag_prototype_t | - tm_tag_function_t | tm_tag_method_t | /* for inline functions */ - tm_tag_macro_t | tm_tag_macro_with_arg_t; - default: - return tm_tag_max_t; - } -} - gboolean tm_workspace_create_global_tags(const char *config_dir, const char *pre_process, const char **includes, int includes_count, const char *tags_file, int lang) { @@ -415,7 +399,7 @@ tm_source_file_free(source_file); return FALSE; } - tags_array = tm_tags_extract(source_file->tags_array, get_global_tag_type_mask(lang)); + tags_array = tm_tags_extract(source_file->tags_array, tm_tag_max_t); if ((NULL == tags_array) || (0 == tags_array->len)) { if (tags_array) @@ -752,6 +736,461 @@ } +static int +find_scope_members_tags (const GPtrArray * all, GPtrArray * tags, + const langType langJava, const char *name, + const char *filename, gboolean no_definitions) +{ + GPtrArray *local = g_ptr_array_new (); + unsigned int i; + TMTag *tag; + size_t len = strlen (name); + for (i = 0; (i < all->len); ++i) + { + tag = TM_TAG (all->pdata[i]); + if (no_definitions && filename && tag->atts.entry.file && + 0 != strcmp (filename, + tag->atts.entry.file->work_object.short_name)) + { + continue; + } + if (tag && tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + { + if (0 == strncmp (name, tag->atts.entry.scope, len)) + { + g_ptr_array_add (local, tag); + } + } + } + if (local->len > 0) + { + unsigned int j; + TMTag *tag2; + char backup = 0; + char *s_backup = NULL; + char *var_type = NULL; + char *scope; + for (i = 0; (i < local->len); ++i) + { + tag = TM_TAG (local->pdata[i]); + scope = tag->atts.entry.scope; + if (scope && 0 == strcmp (name, scope)) + { + g_ptr_array_add (tags, tag); + continue; + } + s_backup = NULL; + j = 0; /* someone could write better code :P */ + while (scope) + { + if (s_backup) + { + backup = s_backup[0]; + s_backup[0] = '\0'; + if (0 == strcmp (name, tag->atts.entry.scope)) + { + j = local->len; + s_backup[0] = backup; + break; + } + } + if (tag->atts.entry.file + && tag->atts.entry.file->lang == langJava) + { + scope = strrchr (tag->atts.entry.scope, '.'); + if (scope) + var_type = scope + 1; + } + else + { + scope = strrchr (tag->atts.entry.scope, ':'); + if (scope) + { + var_type = scope + 1; + scope--; + } + } + if (s_backup) + { + s_backup[0] = backup; + } + if (scope) + { + if (s_backup) + { + backup = s_backup[0]; + s_backup[0] = '\0'; + } + for (j = 0; (j < local->len); ++j) + { + if (i == j) + continue; + tag2 = TM_TAG (local->pdata[j]); + if (tag2->atts.entry.var_type && + 0 == strcmp (var_type, tag2->atts.entry.var_type)) + { + break; + } + } + if (s_backup) + s_backup[0] = backup; + } + if (j < local->len) + { + break; + } + s_backup = scope; + } + if (j == local->len) + { + g_ptr_array_add (tags, tag); + } + } + } + g_ptr_array_free (local, TRUE); + return (int) tags->len; +} + + +#if 0 +static int +find_namespace_members_tags (const GPtrArray * all, GPtrArray * tags, + const langType langJava, const char *name, + const char *filename) +{ + GPtrArray *local = g_ptr_array_new (); + unsigned int i; + TMTag *tag; + size_t len = strlen (name); + + g_return_val_if_fail (all != NULL, 0); + + for (i = 0; (i < all->len); ++i) + { + tag = TM_TAG (all->pdata[i]); + if (filename && tag->atts.entry.file && + 0 != strcmp (filename, + tag->atts.entry.file->work_object.short_name)) + { + continue; + } + + if (tag && tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + { + if (0 == strncmp (name, tag->atts.entry.scope, len)) + { + g_ptr_array_add (local, tag); + } + } + } + + if (local->len > 0) + { + char *scope; + for (i = 0; (i < local->len); ++i) + { + tag = TM_TAG (local->pdata[i]); + scope = tag->atts.entry.scope; + + /* if we wanna complete something like + * namespace1:: + * we'll just return the tags that have "namespace1" + * as their scope. So we won't return classes/members/namespaces + * under, for example, namespace2, where namespace1::namespace2 + */ + if (scope && 0 == strcmp (name, scope)) + { + g_ptr_array_add (tags, tag); + } + } + } + + g_ptr_array_free (local, TRUE); + return (int) tags->len; +} + +const GPtrArray * +tm_workspace_find_namespace_members (const GPtrArray * file_tags, const char *name, + gboolean search_global) +{ + static GPtrArray *tags = NULL; + GPtrArray *local = NULL; + char *new_name = (char *) name; + char *filename = NULL; + int found = 0, del = 0; + static langType langJava = -1; + TMTag *tag = NULL; + + g_return_val_if_fail ((theWorkspace && name && name[0] != '\0'), NULL); + + if (!tags) + tags = g_ptr_array_new (); + + while (1) + { + const GPtrArray *tags2; + int got = 0, types = (tm_tag_class_t | tm_tag_namespace_t | + tm_tag_struct_t | tm_tag_typedef_t | + tm_tag_union_t | tm_tag_enum_t); + + if (file_tags) + { + g_ptr_array_set_size (tags, 0); + got = fill_find_tags_array (tags, file_tags, + new_name, NULL, types, FALSE, -1, FALSE); + } + + + if (got) + { + tags2 = tags; + } + else + { + TMTagAttrType attrs[] = { + tm_tag_attr_name_t, tm_tag_attr_type_t, + tm_tag_attr_none_t + }; + tags2 = tm_workspace_find (new_name, types, attrs, FALSE, -1); + } + + if ((tags2) && (tags2->len == 1) && (tag = TM_TAG (tags2->pdata[0]))) + { + if (tag->type == tm_tag_typedef_t && tag->atts.entry.var_type + && tag->atts.entry.var_type[0] != '\0') + { + new_name = tag->atts.entry.var_type; + continue; + } + filename = (tag->atts.entry.file ? + tag->atts.entry.file->work_object.short_name : NULL); + if (tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + { + del = 1; + if (tag->atts.entry.file && + tag->atts.entry.file->lang == langJava) + { + new_name = g_strdup_printf ("%s.%s", + tag->atts.entry.scope, + new_name); + } + else + { + new_name = g_strdup_printf ("%s::%s", + tag->atts.entry.scope, + new_name); + } + } + break; + } + else + { + return NULL; + } + } + + g_ptr_array_set_size (tags, 0); + + if (tag && tag->atts.entry.file) + { + local = tm_tags_extract (tag->atts.entry.file->work_object.tags_array, + (tm_tag_function_t | + tm_tag_field_t | tm_tag_enumerator_t | + tm_tag_namespace_t | tm_tag_class_t )); + } + else + { + local = tm_tags_extract (theWorkspace->work_object.tags_array, + (tm_tag_function_t | tm_tag_prototype_t | + tm_tag_member_t | + tm_tag_field_t | tm_tag_enumerator_t | + tm_tag_namespace_t | tm_tag_class_t )); + } + + if (local) + { + found = find_namespace_members_tags (local, tags, + langJava, new_name, filename); + g_ptr_array_free (local, TRUE); + } + + + if (!found && search_global) + { + GPtrArray *global = tm_tags_extract (theWorkspace->global_tags, + (tm_tag_member_t | + tm_tag_prototype_t | + tm_tag_field_t | + tm_tag_method_t | + tm_tag_function_t | + tm_tag_enumerator_t | + tm_tag_namespace_t | + tm_tag_class_t )); + + if (global) + { + find_namespace_members_tags (global, tags, langJava, + new_name, filename); +/*/ + DEBUG_PRINT ("returning these"); + gint i; + for (i=0; i < tags->len; i++) { + TMTag *cur_tag; + + cur_tag = (TMTag*)g_ptr_array_index (tags, i); + tm_tag_print (cur_tag, stdout ); + } +/*/ + g_ptr_array_free (global, TRUE); + } + } + + + if (del) + { + g_free (new_name); + } + + return tags; +} +#endif + +const GPtrArray * +tm_workspace_find_scope_members (const GPtrArray * file_tags, const char *name, + gboolean search_global, gboolean no_definitions) +{ + static GPtrArray *tags = NULL; + GPtrArray *local = NULL; + char *new_name = (char *) name; + char *filename = NULL; + int found = 0, del = 0; + static langType langJava = -1; + TMTag *tag = NULL; + + /* FIXME */ + /* langJava = getNamedLanguage ("Java"); */ + + g_return_val_if_fail ((theWorkspace && name && name[0] != '\0'), NULL); + + if (!tags) + tags = g_ptr_array_new (); + + while (1) + { + const GPtrArray *tags2; + int got = 0, types = (tm_tag_class_t | tm_tag_namespace_t | + tm_tag_struct_t | tm_tag_typedef_t | + tm_tag_union_t | tm_tag_enum_t); + + if (file_tags) + { + g_ptr_array_set_size (tags, 0); + got = fill_find_tags_array (tags, file_tags, + new_name, NULL, types, FALSE, -1, FALSE); + } + if (got) + { + tags2 = tags; + } + else + { + TMTagAttrType attrs[] = { + tm_tag_attr_name_t, tm_tag_attr_type_t, + tm_tag_attr_none_t + }; + tags2 = tm_workspace_find (new_name, types, attrs, FALSE, -1); + } + + if ((tags2) && (tags2->len == 1) && (tag = TM_TAG (tags2->pdata[0]))) + { + if (tag->type == tm_tag_typedef_t && tag->atts.entry.var_type + && tag->atts.entry.var_type[0] != '\0') + { + char *tmp_name; + tmp_name = tag->atts.entry.var_type; + if (strcmp(tmp_name, new_name) == 0) { + new_name = NULL; + } + else { + new_name = tmp_name; + } + continue; + } + filename = (tag->atts.entry.file ? + tag->atts.entry.file->work_object.short_name : NULL); + if (tag->atts.entry.scope && tag->atts.entry.scope[0] != '\0') + { + del = 1; + if (tag->atts.entry.file && + tag->atts.entry.file->lang == langJava) + { + new_name = g_strdup_printf ("%s.%s", + tag->atts.entry.scope, + new_name); + } + else + { + new_name = g_strdup_printf ("%s::%s", + tag->atts.entry.scope, + new_name); + } + } + break; + } + else + { + return NULL; + } + } + + g_ptr_array_set_size (tags, 0); + + if (no_definitions && tag && tag->atts.entry.file) + { + local = tm_tags_extract (tag->atts.entry.file->work_object.tags_array, + (tm_tag_function_t | tm_tag_prototype_t | + tm_tag_member_t | tm_tag_field_t | + tm_tag_method_t | tm_tag_enumerator_t)); + } + else + { + local = tm_tags_extract (theWorkspace->work_object.tags_array, + (tm_tag_function_t | tm_tag_prototype_t | + tm_tag_member_t | tm_tag_field_t | + tm_tag_method_t | tm_tag_enumerator_t)); + } + if (local) + { + found = find_scope_members_tags (local, tags, langJava, new_name, + filename, no_definitions); + g_ptr_array_free (local, TRUE); + } + if (!found && search_global) + { + GPtrArray *global = tm_tags_extract (theWorkspace->global_tags, + (tm_tag_member_t | + tm_tag_prototype_t | + tm_tag_field_t | + tm_tag_method_t | + tm_tag_function_t | + tm_tag_enumerator_t + |tm_tag_struct_t | tm_tag_typedef_t | + tm_tag_union_t | tm_tag_enum_t)); + if (global) + { + find_scope_members_tags (global, tags, langJava, new_name, + filename, no_definitions); + g_ptr_array_free (global, TRUE); + } + } + if (del) + { + g_free (new_name); + } + + return tags; +} + const GPtrArray *tm_workspace_get_parents(const gchar *name) { static TMTagAttrType type[] = { tm_tag_attr_name_t, tm_tag_attr_none_t }; diff -Nru /tmp/H5qKeNSrz8/geany-0.17/THANKS /tmp/ssBwSf4GIv/geany-0.18/THANKS --- geany-0.17/THANKS 2009-04-05 15:14:29.000000000 +0100 +++ geany-0.18/THANKS 2009-07-30 12:29:53.000000000 +0100 @@ -64,6 +64,9 @@ 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 +Jon Strait - Markdown filetype patch Translators: ------------ @@ -85,12 +88,14 @@ Jari Rahkonen - fi Jean-Philippe Moal - fr Roland Baudin - fr +Lionel Fuentes - fr Gabor Kmetyko aka kilo - hu M.Baldinelli - it Dario Santomarco - it Tarot Osuji - ja Chikahiro Masami - ja Park Jang-heon - ko +Laurent Hoeltgen - lb Kurt De Bree - nl Jacek Wolszczak - pl_PL Jarosław Foksa - pl_PL @@ -103,6 +108,7 @@ stat.c - ru_RU Andrew Drynov - ru_RU John Wehin - ru_RU +Jože Klepec - sl_SI Tony Mattsson - sv Gürkan Gür - uk diff -Nru /tmp/H5qKeNSrz8/geany-0.17/TODO /tmp/ssBwSf4GIv/geany-0.18/TODO --- geany-0.17/TODO 2009-04-28 17:34:11.000000000 +0100 +++ geany-0.18/TODO 2009-07-16 15:41:59.000000000 +0100 @@ -9,24 +9,20 @@ Next version or later: o documentation: list and explain filetype modes o common default highlighting styles configurable for all - programming languages + 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) - o MRU documents switching + bud for D) - see the build-system SVN branch + o (custom filetypes) o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?) o (selectable menu of arguments to use for Make, from Make Custom) o (DBUS) - o (indent wrapped lines - Scintilla issue) - o (macro support) - o (better search & replace regex support - use + o (sci macro support) + o (better search & replace regex support e.g. multiline - use SCI_GETCHARACTERPOINTER and GNU regex?) o (parsing tags from a memory buffer instead of a file on disk) - o (calltip support for non-C-like languages that use - function_name(arguments) syntax) - o (better tags support for popular languages? - this is a moving - target...) o (tango-like icons for the symbol list) - o (show autocompletion symbol icons - see SCI_REGISTERIMAGE) + o (per-workspace instances with socket support?) 1.0: @@ -41,6 +37,9 @@ -------- Note: these items might not get worked on. + o (calltip support for non-C-like languages that use + function_name(arguments) syntax - see python.c:parseArglist()) + o (better tags support for popular languages? - this is a moving + target...) o Some kind of support for CTags tags files - o Scope resolution for object members o Python plugin interface (different concept from Lua scripting) Binary files /tmp/H5qKeNSrz8/geany-0.17/waf and /tmp/ssBwSf4GIv/geany-0.18/waf differ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/win32-config.h /tmp/ssBwSf4GIv/geany-0.18/win32-config.h --- geany-0.17/win32-config.h 2009-02-15 14:10:10.000000000 +0000 +++ geany-0.18/win32-config.h 2009-05-02 20:12:15.000000000 +0100 @@ -282,9 +282,6 @@ /* Define to 1 if your declares `struct tm'. */ /* #undef TM_IN_SYS_TIME */ -/* Version number of package */ -#define VERSION "0.17" - /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -316,6 +313,9 @@ code using `volatile' can become incorrect without. Disable with care. */ /* #undef volatile */ +/* Version number of package */ +#define VERSION "0.18" + #define REVISION "-1" /* Define if you want to detect a running instance */ diff -Nru /tmp/H5qKeNSrz8/geany-0.17/wscript /tmp/ssBwSf4GIv/geany-0.18/wscript --- geany-0.17/wscript 2009-04-21 21:52:19.000000000 +0100 +++ geany-0.18/wscript 2009-08-13 22:59:33.000000000 +0100 @@ -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 3716 2009-04-21 20:52:19Z eht16 $ +# $Id: wscript 4079 2009-08-13 21:59:33Z eht16 $ """ This is a WAF build script (http://code.google.com/p/waf/). @@ -35,17 +35,26 @@ Known issues: Dependency handling is buggy, e.g. if src/document.h is changed, depending source files are not rebuilt (maybe Waf bug). -Requires WAF 1.5.3 and Python 2.4 (or later). +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). """ -import Build, Configure, Options, Utils -import sys, os, shutil +import Build +import Configure +import Options +import Utils +import sys +import os +import shutil +import tempfile from distutils import version APPNAME = 'geany' -VERSION = '0.17' +VERSION = '0.18' srcdir = '.' blddir = '_build_' @@ -58,7 +67,8 @@ 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', 'tagmanager/haskell.c', 'tagmanager/haxe.c', 'tagmanager/html.c', 'tagmanager/js.c', 'tagmanager/keyword.c', 'tagmanager/latex.c', 'tagmanager/lregex.c', 'tagmanager/lua.c', - 'tagmanager/make.c', 'tagmanager/matlab.c', 'tagmanager/nsis.c', 'tagmanager/options.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/perl.c', 'tagmanager/php.c', 'tagmanager/python.c', 'tagmanager/read.c', 'tagmanager/rest.c', 'tagmanager/ruby.c', 'tagmanager/sh.c', 'tagmanager/sort.c', @@ -72,15 +82,19 @@ 'scintilla/CharClassify.cxx', 'scintilla/ContractionState.cxx', 'scintilla/Decoration.cxx', 'scintilla/DocumentAccessor.cxx', 'scintilla/Document.cxx', 'scintilla/Editor.cxx', 'scintilla/ExternalLexer.cxx', 'scintilla/Indicator.cxx', 'scintilla/KeyMap.cxx', - 'scintilla/KeyWords.cxx', 'scintilla/LexAda.cxx', 'scintilla/LexAsm.cxx', 'scintilla/LexBash.cxx', + '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/LexFortran.cxx', 'scintilla/LexHaskell.cxx', 'scintilla/LexHTML.cxx', - 'scintilla/LexLua.cxx', 'scintilla/LexNsis.cxx', 'scintilla/LexOthers.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/LexMatlab.cxx', 'scintilla/LexYAML.cxx', + 'scintilla/LexR.cxx', 'scintilla/LexRuby.cxx', 'scintilla/LexSQL.cxx', 'scintilla/LexTCL.cxx', - 'scintilla/LexVHDL.cxx', 'scintilla/LineMarker.cxx', 'scintilla/PlatGTK.cxx', + 'scintilla/LexVHDL.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', @@ -93,7 +107,7 @@ 'src/geanymenubuttonaction.c', 'src/geanyobject.c', 'src/geanywraplabel.c', '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/prefix.c', 'src/prefs.c', 'src/printing.c', 'src/project.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/symbols.c', 'src/templates.c', 'src/toolbar.c', 'src/tools.c', 'src/treeviews.c', @@ -119,7 +133,8 @@ # try SVN elif os.path.exists('.svn'): try: - stdout = Utils.cmd_output(cmd='svn info --non-interactive', env={'LANG' : 'C'}) + _env = None if is_win32 else {'LANG' : 'C'} + stdout = Utils.cmd_output(cmd='svn info --non-interactive', silent=True, env=_env) lines = stdout.splitlines(True) for line in lines: if line.startswith('Last Changed Rev'): @@ -139,7 +154,9 @@ elif default_value: conf.define(define_name, default_value, quote) + conf.check_tool('compiler_cc') + is_win32 = target_is_win32(conf.env) conf.check(header_name='fcntl.h') conf.check(header_name='fnmatch.h') @@ -171,12 +188,19 @@ # check for cxx after the header and function checks have been done to ensure they are # checked with cc not cxx - conf.check_tool('compiler_cxx intltool misc') + conf.check_tool('compiler_cxx misc') + if is_win32: + conf.check_tool('winres') + # we don't require intltool on Windows (it would require Perl) though it works well + try: + conf.check_tool('intltool') + except: + pass + + # GTK / GIO version check conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK', mandatory=True, args='--cflags --libs') - - # GTK version check have_gtk_210 = False gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK') if gtk_version: @@ -184,20 +208,47 @@ have_gtk_210 = True else: gtk_version = 'Unknown' - # GIO check conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=False) - conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib') - conf_define_from_opt('DOCDIR', Options.options.docdir, conf.env['DATADIR'] + '/doc/geany') - conf_define_from_opt('MANDIR', Options.options.mandir, conf.env['DATADIR'] + '/man') + # Windows specials + if is_win32: + if conf.env['PREFIX'] == tempfile.gettempdir(): + # overwrite default prefix on Windows (tempfile.gettempdir() is the Waf default) + conf.define('PREFIX', os.path.join(conf.srcdir, '%s-%s' % (APPNAME, VERSION)), 1) + conf.define('DOCDIR', os.path.join(conf.env['PREFIX'], 'doc'), 1) + conf.define('LOCALEDIR', os.path.join(conf.env['PREFIX'], 'share\locale'), 1) + conf.define('LIBDIR', conf.env['PREFIX'], 1) + # DATADIR is defined in objidl.h, so we remove it from config.h but keep it in env + conf.undefine('DATADIR') + conf.env['DATADIR'] = os.path.join(conf.env['PREFIX'], 'data') + # hack: we add the parent directory of the first include directory as this is missing in + # list returned from pkg-config + conf.env['CPPPATH_GTK'].insert(0, os.path.dirname(conf.env['CPPPATH_GTK'][0])) + # we don't need -fPIC when compiling on or for Windows + if '-fPIC' in conf.env['shlib_CCFLAGS']: + conf.env['shlib_CCFLAGS'].remove('-fPIC') + if '-fPIC' in conf.env['CXXFLAGS']: + conf.env['CXXFLAGS'].remove('-fPIC') + conf.env.append_value('program_LINKFLAGS', '-mwindows') + conf.env.append_value('LIB_WIN32', [ 'wsock32', 'uuid', 'ole32', 'iberty' ]) + conf.env['shlib_PATTERN'] = '%s.dll' + conf.env['program_PATTERN'] = '%s.exe' + else: + conf.env['shlib_PATTERN'] = '%s.so' + conf_define_from_opt('DOCDIR', Options.options.docdir, + os.path.join(conf.env['DATADIR'], 'doc/geany')) + conf_define_from_opt('LIBDIR', Options.options.libdir, + os.path.join(conf.env['PREFIX'], 'lib')) + conf_define_from_opt('MANDIR', Options.options.mandir, + os.path.join(conf.env['DATADIR'], 'man')) svn_rev = conf_get_svn_rev() conf.define('ENABLE_NLS', 1) - conf.define('GEANY_LOCALEDIR', 'LOCALEDIR', 0) - conf.define('GEANY_DATADIR', 'DATADIR', 0) - conf.define('GEANY_DOCDIR', 'DOCDIR', 0) - conf.define('GEANY_LIBDIR', 'LIBDIR', 0) - conf.define('GEANY_PREFIX', conf.env['PREFIX'], 1) + conf.define('GEANY_LOCALEDIR', '' if is_win32 else conf.env['LOCALEDIR'], 1) + conf.define('GEANY_DATADIR', 'data' if is_win32 else conf.env['DATADIR'], 1) + conf.define('GEANY_DOCDIR', conf.env['DOCDIR'], 1) + conf.define('GEANY_LIBDIR', '' if is_win32 else conf.env['LIBDIR'], 1) + conf.define('GEANY_PREFIX', '' if is_win32 else conf.env['PREFIX'], 1) conf.define('PACKAGE', APPNAME, 1) conf.define('VERSION', VERSION, 1) conf.define('REVISION', svn_rev, 1) @@ -222,7 +273,8 @@ conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H') # Scintilla flags - conf.env.append_value('CXXFLAGS', '-DNDEBUG -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE'.split()) + conf.env.append_value('CXXFLAGS', + '-DNDEBUG -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE'.split()) def set_options(opt): @@ -235,9 +287,11 @@ 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]', dest='no_socket') - opt.add_option('--disable-vte', action='store_true', default=False, - help='compile without support for an embedded virtual terminal [[default: No]', dest='no_vte') + 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]', + 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') # Paths @@ -250,6 +304,8 @@ # Actions opt.add_option('--htmldoc', action='store_true', default=False, help='generate HTML documentation', dest='htmldoc') + opt.add_option('--hackingdoc', action='store_true', default=False, + help='generate HTML documentation from HACKING file', dest='hackingdoc') opt.add_option('--apidoc', action='store_true', default=False, help='generate API reference documentation', dest='apidoc') opt.add_option('--update-po', action='store_true', default=False, @@ -257,21 +313,22 @@ def build(bld): + is_win32 = target_is_win32(bld.env) + def build_plugin(plugin_name, install = True): if install: - instpath = '${LIBDIR}/geany/' + instpath = '${PREFIX}/lib' if is_win32 else '${LIBDIR}/geany/' else: instpath = None bld.new_task_gen( - features ='cc cshlib', + features = 'cc cshlib', source = 'plugins/' + plugin_name + '.c', includes = '. plugins/ src/ scintilla/include tagmanager/include', target = plugin_name, uselib = 'GTK', - install_path = instpath, + install_path = instpath ) - bld.env['shlib_PATTERN'] = '%s.so' # Tagmanager @@ -301,16 +358,18 @@ # Geany if bld.env['HAVE_VTE'] == 1: geany_sources.append('src/vte.c') - if sys.platform == "win32": + if is_win32: geany_sources.append('src/win32.c') + bld.new_task_gen( features = 'cc cxx cprogram', name = 'geany', target = 'geany', source = geany_sources, includes = '. src/ scintilla/include/ tagmanager/include/', - uselib = 'GTK GIO', - uselib_local = 'scintilla tagmanager' + uselib = 'GTK GIO WIN32', + uselib_local = 'scintilla tagmanager', + add_objects = 'geany-rc' if is_win32 else None ) # geanyfunctions.h @@ -330,21 +389,16 @@ build_plugin('filebrowser') build_plugin('htmlchars') build_plugin('saveactions') - build_plugin('splitwindow') + build_plugin('splitwindow', not is_win32) # Translations - bld.new_task_gen( - features = 'intltool_po', - podir = 'po', - appname = 'geany' - ) - - bld.new_task_gen( - features = 'intltool_in', - source = 'geany.desktop.in', - flags = '-d', - install_path = '${DATADIR}/applications' - ) + if bld.env['INTLTOOL']: + bld.new_task_gen( + features = 'intltool_po', + podir = 'po', + install_path = '${LOCALEDIR}', + appname = 'geany' + ) # geany.pc bld.new_task_gen( @@ -359,84 +413,116 @@ 'datarootdir': '${prefix}/share', 'datadir': '${datarootdir}', 'localedir': '${datarootdir}/locale' }, - install_path = '${LIBDIR}/pkgconfig' + install_path = None if is_win32 else '${LIBDIR}/pkgconfig' ) - # geany.1 - bld.new_task_gen( - features = 'subst', - source = 'doc/geany.1.in', - target = 'geany.1', - dict = { 'VERSION' : VERSION, - 'GEANY_DATA_DIR': bld.env['DATADIR'] + '/geany' }, - install_path = '${MANDIR}/man1' - ) + if not is_win32: + # geany.desktop + if bld.env['INTLTOOL']: + bld.new_task_gen( + features = 'intltool_in', + source = 'geany.desktop.in', + flags = [ '-d', '-q', '-u', '-c' ], + install_path = '${DATADIR}/applications' + ) - # geany.spec - bld.new_task_gen( - features = 'subst', - source = 'geany.spec.in', - target = 'geany.spec', - install_path = None, - dict = { 'VERSION' : VERSION } - ) + # geany.1 + bld.new_task_gen( + features = 'subst', + source = 'doc/geany.1.in', + target = 'geany.1', + dict = { 'VERSION' : VERSION, + 'GEANY_DATA_DIR': bld.env['DATADIR'] + '/geany' }, + install_path = '${MANDIR}/man1' + ) - # Doxyfile - bld.new_task_gen( - features = 'subst', - source = 'doc/Doxyfile.in', - target = 'doc/Doxyfile', - install_path = None, - dict = { 'VERSION' : VERSION } - ) + # geany.spec + bld.new_task_gen( + features = 'subst', + source = 'geany.spec.in', + target = 'geany.spec', + install_path = None, + dict = { 'VERSION' : VERSION } + ) + + # Doxyfile + bld.new_task_gen( + features = 'subst', + source = 'doc/Doxyfile.in', + target = 'doc/Doxyfile', + install_path = None, + dict = { 'VERSION' : VERSION } + ) + else: + bld.new_task_gen( + features = 'cc', + name = 'geany-rc', + source = 'geany_private.rc' + ) ### # Install files ### - # 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/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 ''') - bld.install_files('${PREFIX}/include/geany/tagmanager', ''' - tagmanager/include/tm_file_entry.h tagmanager/include/tm_project.h tagmanager/include/tm_source_file.h - tagmanager/include/tm_symbol.h tagmanager/include/tm_tag.h tagmanager/include/tm_tagmanager.h - tagmanager/include/tm_work_object.h tagmanager/include/tm_workspace.h ''') + 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 ''') + bld.install_files('${PREFIX}/include/geany/scintilla', ''' + scintilla/include/SciLexer.h scintilla/include/Scintilla.h + scintilla/include/Scintilla.iface scintilla/include/ScintillaWidget.h ''') + bld.install_files('${PREFIX}/include/geany/tagmanager', ''' + tagmanager/include/tm_file_entry.h tagmanager/include/tm_project.h + tagmanager/include/tm_source_file.h + tagmanager/include/tm_symbol.h tagmanager/include/tm_tag.h + tagmanager/include/tm_tagmanager.h tagmanager/include/tm_work_object.h + tagmanager/include/tm_workspace.h ''') # Docs - bld.install_files('${DOCDIR}', 'AUTHORS ChangeLog COPYING README NEWS THANKS TODO') - bld.install_files('${DOCDIR}/html/images', 'doc/images/*.png') - bld.install_as('${DOCDIR}/manual.txt', 'doc/geany.txt') - bld.install_as('${DOCDIR}/html/index.html', 'doc/geany.html') + base_dir = '${PREFIX}' if is_win32 else '${DOCDIR}' + ext = '.txt' if is_win32 else '' + html_dir = '' if is_win32 else 'html/' + html_name = 'Manual.html' if is_win32 else 'index.html' + for f in 'AUTHORS ChangeLog COPYING README NEWS THANKS TODO'.split(): + bld.install_as("%s/%s%s" % (base_dir, uc_first(f, is_win32), ext), f) + bld.install_files('${DOCDIR}/%simages' % html_dir, 'doc/images/*.png') + bld.install_as('${DOCDIR}/%s' % uc_first('manual.txt', is_win32), 'doc/geany.txt') + bld.install_as('${DOCDIR}/%s%s' % (html_dir, html_name), 'doc/geany.html') bld.install_as('${DOCDIR}/ScintillaLicense.txt', 'scintilla/License.txt') + if is_win32: + bld.install_as('${DOCDIR}/ReadMe.I18n.txt', 'README.I18N') + bld.install_as('${DOCDIR}/Hacking.txt', 'HACKING') # Data - bld.install_files('${DATADIR}/geany', 'data/filetype*') - bld.install_files('${DATADIR}/geany', 'data/*.tags') - bld.install_files('${DATADIR}/geany', 'data/snippets.conf') - bld.install_files('${DATADIR}/geany', 'data/ui_toolbar.xml') - bld.install_as('${DATADIR}/geany/GPL-2', 'COPYING') + dir = '' if is_win32 else 'geany' + bld.install_files('${DATADIR}/%s' % dir, 'data/filetype*') + 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_as('${DATADIR}/%s/GPL-2' % dir, 'COPYING') # Icons - bld.install_files('${DATADIR}/pixmaps', 'pixmaps/geany.png') - bld.install_files('${DATADIR}/icons/hicolor/16x16/apps', 'icons/16x16/*.png') + bld.install_files('${PREFIX}/share/icons' + if is_win32 else '${DATADIR}/icons/hicolor/16x16/apps', 'icons/16x16/*.png') + if not is_win32: + bld.install_files('${DATADIR}/icons/hicolor/48x48/apps', 'icons/48x48/*.png') + bld.install_files('${DATADIR}/icons/hicolor/scalable/apps', 'icons/scalable/*.svg') 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 - if Options.commands['install'] or Options.commands['uninstall']: + if not is_win32 and not Options.options.destdir and (Options.commands['install'] or \ + Options.commands['uninstall']): dir = Build.bld.get_install_path('${DATADIR}/icons/hicolor') icon_cache_updated = False - if not Options.options.destdir: - try: - Utils.exec_command('gtk-update-icon-cache -q -f -t %s' % dir) - Utils.pprint('GREEN', 'GTK icon cache updated.') - icon_cache_updated = True - except: - Utils.pprint('YELLOW', 'Failed to update icon cache for ' + dir + '.') - if not icon_cache_updated and not Options.options.destdir: + try: + Utils.exec_command('gtk-update-icon-cache -q -f -t %s' % dir) + Utils.pprint('GREEN', 'GTK icon cache updated.') + icon_cache_updated = True + except: + Utils.pprint('YELLOW', 'Failed to update icon cache for %s.' % dir) + if not icon_cache_updated: print 'Icon cache not updated. After install, run this:' print 'gtk-update-icon-cache -q -f -t %s' % dir @@ -451,15 +537,23 @@ 'doxygen could not be found. Please install the doxygen package.') sys.exit(1) - if Options.options.htmldoc: + if Options.options.htmldoc or Options.options.hackingdoc: # first try rst2html.py as it is the upstream default, fall back to rst2html cmd = Configure.find_program_impl(Build.bld.env, 'rst2html.py') if not cmd: cmd = Configure.find_program_impl(Build.bld.env, 'rst2html') if cmd: + if Options.options.hackingdoc: + file_in = '../HACKING' + file_out = 'hacking.html' + msg = 'HACKING HTML' + else: + file_in = 'geany.txt' + file_out = 'geany.html' + msg = 'HTML' os.chdir('doc') - ret = launch(cmd + ' -stg --stylesheet=geany.css geany.txt geany.html', - 'Generating HTML documentation') + ret = launch(cmd + ' -stg --stylesheet=geany.css %s %s' % (file_in, file_out), + 'Generating %s documentation' % msg) else: Utils.pprint('RED', 'rst2html.py could not be found. Please install the Python docutils package.') @@ -507,3 +601,19 @@ conf.check_message_1(msg) conf.check_message_2(result, color) + +def uc_first(s, is_win32): + if is_win32: + return s.title() + return s + + +def target_is_win32(env): + if sys.platform == 'win32': + return True + if env and 'CC' in env: + cc = env['CC'] + if not isinstance(cc, str): + cc = ''.join(cc) + return cc.find('mingw') != -1 + return False