Mercurial > gftp.yaz
changeset 33:c8ec7877432e
2002-10-06 Brian Masney <masneyb@gftp.org>
* src/gtk/delete_dialog.c, src/gtk/gftp-gtk.c, src/gtk/misc-gtk.c,
src/gtk/transfer.c - Fixed dead-locks with GDK_THREADS_{ENTER,LEAVE}
* configure.in, src/gtk/Makefile.am - Use GTHREAD_LIBS
2002-10-03 Brian Masney <masneyb@gftp.org>
* Makefile.am - remove intl and m4 directory from subdirs. autogen.sh
will automagically add these for me.
* autogen.sh - remove check for libtool
* configure.in - link in gthread
* cvsclean - added this script
* *.[ch] - added $Id$ tags
* debian/* - updated files from Debian maintainer
line wrap: on
line diff
--- a/ChangeLog Thu Oct 03 12:06:18 2002 +0000 +++ b/ChangeLog Mon Oct 07 10:40:43 2002 +0000 @@ -1,3 +1,23 @@ +2002-10-06 Brian Masney <masneyb@gftp.org> + * src/gtk/delete_dialog.c, src/gtk/gftp-gtk.c, src/gtk/misc-gtk.c, + src/gtk/transfer.c - Fixed dead-locks with GDK_THREADS_{ENTER,LEAVE} + + * configure.in, src/gtk/Makefile.am - Use GTHREAD_LIBS + +2002-10-03 Brian Masney <masneyb@gftp.org> + * Makefile.am - remove intl and m4 directory from subdirs. autogen.sh + will automagically add these for me. + + * autogen.sh - remove check for libtool + + * configure.in - link in gthread + + * cvsclean - added this script + + * *.[ch] - added $Id: ChangeLog,v 1.14 2002/10/07 10:40:35 masneyb Exp $ tags + + * debian/* - updated files from Debian maintainer + 2002-10-03 Brian Masney <masneyb@gftp.org> * src/gtk/gftp-gtk.c - call g_thread_init (NULL)
--- a/Makefile.am Thu Oct 03 12:06:18 2002 +0000 +++ b/Makefile.am Mon Oct 07 10:40:43 2002 +0000 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS= intl m4 docs lib po src -EXTRA_DIST= config.rpath mkinstalldirs ChangeLog-old README THANKS TODO \ +SUBDIRS=docs lib po src +EXTRA_DIST=ChangeLog-old README THANKS TODO \ gftp.spec.in debian/changelog debian/control debian/copyright \ debian/dirs debian/docs debian/menu debian/rules
--- a/aclocal.m4 Thu Oct 03 12:06:18 2002 +0000 +++ b/aclocal.m4 Mon Oct 07 10:40:43 2002 +0000 @@ -1,193 +1,71 @@ -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- - -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# 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. - -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_PREREQ([2.52]) +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. -# serial 6 - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. We must strip everything past the first ":", -# and everything past the last "/". +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. -# _AM_DIRNAME(PATH) -# ----------------- -# Like AS_DIRNAME, only do it during macro expansion -AC_DEFUN([_AM_DIRNAME], - [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, - m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, - m4_if(regexp([$1], [^/.*]), -1, - [.], - patsubst([$1], [^\(/\).*], [\1])), - patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), - patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl -])# _AM_DIRNAME - - -# The stamp files are numbered to have different names. -# We could number them on a directory basis, but that's additional -# complications, let's have a unique counter. -m4_define([_AM_STAMP_Count], [0]) - - -# _AM_STAMP(HEADER) -# ----------------- -# The name of the stamp file for HEADER. -AC_DEFUN([_AM_STAMP], -[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl -AS_ESCAPE(_AM_DIRNAME(patsubst([$1], - [:.*])))/stamp-h[]_AM_STAMP_Count]) - +# Like AC_CONFIG_HEADER, but automatically create stamp file. -# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) -# ------------------------------------------------------------ -# We used to try to get a real timestamp in stamp-h. But the fear is that -# that will cause unnecessary cvs conflicts. -AC_DEFUN([_AM_CONFIG_HEADER], -[# Add the stamp file to the list of files AC keeps track of, -# along with our hook. -AC_CONFIG_HEADERS([$1], - [# update the timestamp -echo 'timestamp for $1' >"_AM_STAMP([$1])" -$2], - [$3]) -])# _AM_CONFIG_HEADER - - -# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) -# -------------------------------------------------------------- AC_DEFUN([AM_CONFIG_HEADER], -[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) -])# AM_CONFIG_HEADER - -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +[AC_PREREQ([2.12]) +AC_CONFIG_HEADER([$1]) +dnl When config.status generates a header, we must update the stamp-h file. +dnl This file resides in the same directory as the config header +dnl that is generated. We must strip everything past the first ":", +dnl and everything past the last "/". +AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl +ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, +<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, +<<am_indx=1 +for am_file in <<$1>>; do + case " <<$>>CONFIG_HEADERS " in + *" <<$>>am_file "*<<)>> + echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx + ;; + esac + am_indx=`expr "<<$>>am_indx" + 1` +done<<>>dnl>>) +changequote([,]))]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 8 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# Do all the work for Automake. This macro actually does too much -- +# some checks are only needed if your package does certain things. +# But this isn't really a big deal. - -AC_PREREQ([2.52]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +# serial 1 -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. +dnl Usage: +dnl AM_INIT_AUTOMAKE(package,version, [no-define]) + AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then +AC_REQUIRE([AC_PROG_INSTALL]) +PACKAGE=[$1] +AC_SUBST(PACKAGE) +VERSION=[$2] +AC_SUBST(VERSION) +dnl test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl - AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_][CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_][CC], - defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_][CXX], - defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) +ifelse([$3],, +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) +AC_REQUIRE([AM_SANITY_CHECK]) +AC_REQUIRE([AC_ARG_PROGRAM]) +dnl FIXME This is truly gross. +missing_dir=`cd $ac_aux_dir && pwd` +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) +AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) +AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) +AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) +AC_REQUIRE([AC_PROG_MAKE_SET])]) # Copyright 2002 Free Software Foundation, Inc. @@ -209,103 +87,37 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6.3])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + [AM_AUTOMAKE_VERSION([1.4-p6])]) # # Check to make sure that the build environment is sane. # -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_SANITY_CHECK -# --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 -echo timestamp > conftest.file +echo timestamp > conftestfile # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then + set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` + if test "[$]*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t $srcdir/configure conftestfile` fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then + if test "[$]*" != "X $srcdir/configure conftestfile" \ + && test "[$]*" != "X conftestfile $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a @@ -315,7 +127,7 @@ alias in your environment]) fi - test "$[2]" = conftest.file + test "[$]2" = conftestfile ) then # Ok. @@ -324,533 +136,141 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi +rm -f conftest* AC_MSG_RESULT(yes)]) -# -*- Autoconf -*- - - -# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ +dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) +dnl The program must properly implement --version. AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} +[AC_MSG_CHECKING(for working $2) +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +# Redirect stdin to placate older versions of autoconf. Sigh. +if ($2 --version) < /dev/null > /dev/null 2>&1; then + $1=$2 + AC_MSG_RESULT(found) +else + $1="$3/missing $2" + AC_MSG_RESULT(missing) +fi AC_SUBST($1)]) - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_AUX_DIR_EXPAND - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +#serial 4 -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. +dnl By default, many hosts won't let programs access large files; +dnl one must use special compiler options to get large-file access to work. +dnl For more details about this brain damage please see: +dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) - -AC_DEFUN([AM_AUX_DIR_EXPAND], [ -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# AM_PROG_INSTALL_STRIP +dnl Written by Paul Eggert <eggert@twinsun.com>. -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# serial 4 -*- Autoconf -*- - -# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME) +AC_DEFUN(AC_SYS_LARGEFILE_FLAGS, + [AC_CACHE_CHECK([for $1 value to request large file support], + ac_cv_sys_largefile_$1, + [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || { + ac_cv_sys_largefile_$1=no + ifelse($1, CFLAGS, + [case "$host_os" in + # IRIX 6.2 and later require cc -n32. +changequote(, )dnl + irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) +changequote([, ])dnl + if test "$GCC" != yes; then + ac_cv_sys_largefile_CFLAGS=-n32 + fi + ac_save_CC="$CC" + CC="$CC $ac_cv_sys_largefile_CFLAGS" + AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no) + CC="$ac_save_CC" + esac]) + }])]) - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[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 - - am_cv_$1_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 - # 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. - echo '#include "conftest.h"' > conftest.c - echo 'int i;' > conftest.h - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL) +AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND, + [case $2 in + no) ;; + ?*) + case "[$]$1" in + '') $1=$2 ;; + *) $1=[$]$1' '$2 ;; + esac ;; + esac]) - 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=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[rm -f .deps 2>/dev/null -mkdir .deps 2>/dev/null -if test -d .deps; then - DEPDIR=.deps -else - # MS-DOS does not allow filenames that begin with a dot. - DEPDIR=_deps -fi -rmdir .deps 2>/dev/null -AC_SUBST([DEPDIR]) -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -#serial 2 +dnl Internal subroutine of AC_SYS_LARGEFILE. +dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT) +AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, + [AC_CACHE_CHECK([for $1], $2, + [$2=no +changequote(, )dnl + $4 + for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do + case "$ac_flag" in + -D$1) + $2=1 ;; + -D$1=*) + $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; + esac + done +changequote([, ])dnl + ]) + if test "[$]$2" != no; then + AC_DEFINE_UNQUOTED([$1], [$]$2, [$3]) + fi]) -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; 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. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` - test -z "$DEPDIR" && continue - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # 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 -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 +AC_DEFUN(AC_SYS_LARGEFILE, + [AC_REQUIRE([AC_CANONICAL_HOST]) + AC_ARG_ENABLE(largefile, + [ --disable-largefile omit support for large files]) + if test "$enable_largefile" != no; then + AC_CHECK_TOOL(GETCONF, getconf) + AC_SYS_LARGEFILE_FLAGS(CFLAGS) + AC_SYS_LARGEFILE_FLAGS(LDFLAGS) + AC_SYS_LARGEFILE_FLAGS(LIBS) + + for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do + case "$ac_flag" in + no) ;; + -D_FILE_OFFSET_BITS=*) ;; + -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; + -D_LARGE_FILES | -D_LARGE_FILES=*) ;; + -D?* | -I?*) + AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;; + *) + AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;; + esac + done + AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS") + AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS") + AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, + ac_cv_sys_file_offset_bits, + [Number of bits in a file offset, on hosts where this is settable.] + [case "$host_os" in + # HP-UX 10.20 and later + hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) + ac_cv_sys_file_offset_bits=64 ;; + esac]) + AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, + ac_cv_sys_largefile_source, + [Define to make fseeko etc. visible, on some hosts.], + [case "$host_os" in + # HP-UX 10.20 and later + hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) + ac_cv_sys_largefile_source=1 ;; + esac]) + AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, + ac_cv_sys_large_files, + [Define for large files, on AIX-style hosts.], + [case "$host_os" in + # AIX 4.2 and later + aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) + ac_cv_sys_large_files=1 ;; + esac]) + fi + ]) -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -doit: - @echo done -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST(am__include) -AC_SUBST(am__quote) -AC_MSG_RESULT($_am_result) -rm -f confinc confmf -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 5 - -AC_PREREQ(2.52) - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional \"$1\" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) - - -# Copyright 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. # serial 1 @@ -865,32 +285,15 @@ else AC_MSG_RESULT(no) U=_ ANSI2KNR=./ansi2knr + # Ensure some checks needed by ansi2knr itself. + AC_HEADER_STDC + AC_CHECK_HEADERS(string.h) fi -# Ensure some checks needed by ansi2knr itself. -AC_HEADER_STDC -AC_CHECK_HEADERS(string.h) AC_SUBST(U)dnl AC_SUBST(ANSI2KNR)dnl ]) -# Copyright 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - # serial 1 # @defmac AC_PROG_CC_STDC @@ -918,7 +321,7 @@ dnl FIXME: can't do this because then AC_AIX won't work due to a dnl circular dependency. dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) +AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) AC_CACHE_VAL(am_cv_prog_cc_stdc, [am_cv_prog_cc_stdc=no ac_save_CC="$CC" @@ -926,10 +329,9 @@ # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE +# HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" AC_TRY_COMPILE( @@ -971,7 +373,7 @@ if test -z "$am_cv_prog_cc_stdc"; then AC_MSG_RESULT([none needed]) else - AC_MSG_RESULT([$am_cv_prog_cc_stdc]) + AC_MSG_RESULT($am_cv_prog_cc_stdc) fi case "x$am_cv_prog_cc_stdc" in x|xno) ;; @@ -982,23 +384,6 @@ # Add --enable-maintainer-mode option to configure. # From Jim Meyering -# Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - # serial 1 AC_DEFUN([AM_MAINTAINER_MODE], @@ -1009,13 +394,26 @@ (and sometimes confusing) to the casual installer], USE_MAINTAINER_MODE=$enableval, USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) MAINT=$MAINTAINER_MODE_TRUE AC_SUBST(MAINT)dnl ] ) +# Define a conditional. + +AC_DEFUN([AM_CONDITIONAL], +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + # Configure paths for GLIB # Owen Taylor 97-11-3 @@ -1271,6 +669,25 @@ + +# serial 1 + +AC_DEFUN([AM_WITH_DMALLOC], +[AC_MSG_CHECKING(if malloc debugging is wanted) +AC_ARG_WITH(dmalloc, +[ --with-dmalloc use dmalloc, as in + ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz], +[if test "$withval" = yes; then + AC_MSG_RESULT(yes) + AC_DEFINE(WITH_DMALLOC,1, + [Define if using the dmalloc debugging malloc package]) + LIBS="$LIBS -ldmalloc" + LDFLAGS="$LDFLAGS -g" +else + AC_MSG_RESULT(no) +fi], [AC_MSG_RESULT(no)]) +]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 @@ -2054,155 +1471,6 @@ dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) -# lib-prefix.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - # lib-link.m4 serial 3 (gettext-0.11.3) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU @@ -2758,6 +2026,155 @@ done ]) +# lib-prefix.m4 serial 1 (gettext-0.11) +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) + # lib-ld.m4 serial 1 (gettext-0.11) dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU
--- a/autogen.sh Thu Oct 03 12:06:18 2002 +0000 +++ b/autogen.sh Mon Oct 07 10:40:43 2002 +0000 @@ -12,23 +12,6 @@ DIE=0 -have_libtool=false -if libtool --version < /dev/null > /dev/null 2>&1 ; then - libtool_version=`libtoolize --version | libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` - case $libtool_version in - 1.4*) - have_libtool=true - ;; - esac -fi -if $have_libtool ; then : ; else - echo - echo "You must have libtool 1.4 installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -fi - (autoconf --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $PROJECT." @@ -100,7 +83,7 @@ cd $ORIGDIR if test -z "$AUTOGEN_SUBDIR_MODE"; then - $srcdir/configure --enable-maintainer-mode "$@" + CFLAGS="-Wall -ansi -D_GNU_SOURCE -O -g" $srcdir/configure --enable-maintainer-mode "$@" echo echo "Now type 'make' to compile $PROJECT."
--- a/configure.in Thu Oct 03 12:06:18 2002 +0000 +++ b/configure.in Mon Oct 07 10:40:43 2002 +0000 @@ -160,6 +160,11 @@ GFTP_GTK="" PTHREAD_CFLAGS="" PTHREAD_LIBS="" + +# I don't have PKG_CHECK_MODULES or AM_PATH_GLIB check for gthread because +# the text port doesn't need to be compiled against the thread libraries +GTHREAD_LIBS="" + if test "x$enable_gtkport" = "x1" ; then if test "x$enable_gtk20" = "x1" ; then PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.3.8, GFTP_GTK=gftp-gtk) @@ -167,6 +172,9 @@ if test "x$GFTP_GTK" = "x" ; then AM_PATH_GTK(1.2.3, GFTP_GTK=gftp-gtk, AC_MSG_WARN(gFTP needs GTK+ 1.2.3 or higher for the graphical version. Only building the text version)) + GTHREAD_LIBS="-lgthread" + else + GTHREAD_LIBS="-lgthread-2.0" fi if test "x$GFTP_GTK" = xgftp-gtk; then @@ -232,6 +240,7 @@ fi AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_LIBS) +AC_SUBST(GTHREAD_LIBS) AC_SUBST(GFTP_GTK) AM_GNU_GETTEXT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cvsclean Mon Oct 07 10:40:43 2002 +0000 @@ -0,0 +1,14 @@ +#!/bin/sh + +make distclean +find . -name Makefile.in -exec rm -f {} \; +find . -name Makefile -exec rm -f {} \; +find . -name "*~" -exec rm -f {} \; +rm -rf intl +rm -f po/Makefile.in.in po/*.gmo po/Makevars.template po/Rules-quot po/boldquot.sed po/en@boldquot.header po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin config.log config.cache config.status config.h gftp.spec stamp-h stamp-h.in ABOUT-NLS INSTALL config.guess config.rpath config.status config.sub configure install-sh missing mkinstalldirs + +cat configure.in | sed s/\ intl\\/Makefile\ //g | sed s/po\\/Makefile.in\ //g > configure.in.new +mv configure.in.new configure.in + +cat Makefile.am | sed s/\ intl\ //g | sed s/\ config\.rpath//g | sed s/mkinstalldirs//g > Makefile.am.new +mv Makefile.am.new Makefile.am
--- a/debian/changelog Thu Oct 03 12:06:18 2002 +0000 +++ b/debian/changelog Mon Oct 07 10:40:43 2002 +0000 @@ -1,46 +1,66 @@ -gftp (2.0.13) unstable; urgency=low - - * New release. See CHANGELOG for details on changes in this release +gftp (2.0.13-1) unstable; urgency=low - -- Brian Masney <masneyb@seul.org> Fri, 19 Jul 2002 06:19:46 -0500 + * Added a gftp mini logo (gftp-mini-logo.xpm) and using it in the menu file + which closes: #153468. + * New upstream release, it fix gftp-text problem, so closes: #153836. -gftp (2.0.12) unstable; urgency=low + -- Aurelien Beaujean <aure@debian.org> Mon, 22 Jul 2002 10:21:44 +0200 - * New release. See CHANGELOG for details on changes in this release +gftp (2.0.12-1) unstable; urgency=low - -- Brian Masney <masneyb@seul.org> Tue, 21 May 2002 22:33:23 -0500 + * Moving menu file into gftp-common: closes: #135042. + * Forgot to close the german translation mistake warning in the pervious + release so: closes: #125384. + * Changing maintainer's email. + * New upstream release, so closes segfault bug: closes: #146836. -gftp (2.0.11) unstable; urgency=low + -- Aurelien Beaujean <aure@debian.org> Sat, 13 Jul 2002 13:47:13 +0200 - * New release. See CHANGELOG for details on changes in this release +gftp (2.0.11-1) unstable; urgency=low - -- Brian Masney <masneyb@seul.org> Thu, 03 Jan 2002 15:32:37 -0500 + * New release. + + -- Aurelien Beaujean <beaujean@efrei.fr> Thu, 17 Jan 2002 20:52:36 +0100 -gftp (2.0.10) unstable; urgency=low +gftp (2.0.10-2) unstable; urgency=low - * New release. See CHANGELOG for details on changes in this release + * Added ABOUT-NLS, THANKS and docs/USERS-GUIDE in debian/docs file. + * Added an icon entry in the debian/menu file. + * Change of the debhelper version to 3. + * Checked and changed Standards-Version to 3.5.6.0. - -- Brian Masney <masneyb@seul.org> Thu, 20 Dec 2001 19:32:42 -0500 + -- Aurelien Beaujean <beaujean@efrei.fr> Fri, 28 Dec 2001 12:16:09 +0100 -gftp (2.0.9) unstable; urgency=low +gftp (2.0.10-1) unstable; urgency=low - * New release. See CHANGELOG for details on changes in this release + * New release, closes: #126134. + * Included a new docs/sample.gftp/deb.xpm icon that best represent Debian, + closes: #123932. + * Correct spelling mistake SSG instead of SSH in german lang files, + closes: #116619. - -- Brian Masney <masneyb@seul.org> Fri, 23 Nov 2001 13:36:10 -0500 + -- Aurelien Beaujean <beaujean@efrei.fr> Wed, 26 Dec 2001 13:02:33 +0100 -gftp (2.0.9pre3) unstable; urgency=low +gftp (2.0.9-1) unstable; urgency=low - * New release. See CHANGELOG for details on changes in this release + * New release. + * Added SSH file transfert and FXP support in the package description. - -- Brian Masney <masneyb@seul.org> Thu, 15 Nov 2001 20:26:33 -0500 + -- Aurelien Beaujean <beaujean@efrei.fr> Sat, 01 Dec 2001 23:08:31 +0100 -gftp (2.0.9pre2) unstable; urgency=low +gftp (2.0.9pre3-1) unstable; urgency=low + + * New upstream version. - * New release. See CHANGELOG for details on changes in this release + -- Aurelien Beaujean <beaujean@efrei.fr> Wed, 21 Nov 2001 19:42:18 +0100 + +gftp (2.0.9pre2-1) unstable; urgency=low - -- Brian Masney <masneyb@seul.org> Sat, 3 Nov 2001 08:11:15 -0500 + * New maintainer, Closes: #109220. -gftp (2.0.9pre1) unstable; urgency=low + -- Aurelien Beaujean <beaujean@efrei.fr> Sat, 3 Nov 2001 18:11:15 -0200 + +gftp (2.0.9pre1-1) unstable; urgency=low * New release. See CHANGELOG for details on changes in this release @@ -233,7 +253,7 @@ * Changed automatic password creation from "user@host" to "user@host.domain" * Changed "X Windows" to "X11 Sites" since the X Consortium doesn't like their product to be called like a similar named crappy piece of [zensored]. - + -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 7 Jan 1999 20:41:16 +0100 gftp (0.2-1) unstable; urgency=low @@ -241,7 +261,4 @@ * First trial -- Martin Schulze <joey@finlandia.infodrom.north.de> Tue, 5 Jan 1999 12:31:13 +0100 - -Local variables: -mode: debian-changelog -End: +
--- a/debian/control Thu Oct 03 12:06:18 2002 +0000 +++ b/debian/control Mon Oct 07 10:40:43 2002 +0000 @@ -1,9 +1,9 @@ Source: gftp Section: net Priority: optional -Maintainer: Josip Rodin <jrodin@jagor.srce.hr> -Build-Depends: debhelper (>= 2), libglib1.2-dev, libgtk1.2-dev -Standards-Version: 3.5.2 +Maintainer: Aurelien Beaujean <aure@debian.org> +Build-Depends: debhelper (>= 3), libglib1.2-dev, libgtk1.2-dev +Standards-Version: 3.5.6.0 Package: gftp Architecture: any @@ -17,8 +17,8 @@ Package: gftp-gtk Architecture: any -Depends: ${shlibs:Depends}, gftp-common (>= 2.0.8-2) -Replaces: gftp (<< 2.0.8) +Depends: ${shlibs:Depends}, gftp-common (>= 2.0.13-1) +Replaces: gftp (<< 2.0.13) Description: X/GTK+ FTP client gFTP is a multithreaded FTP client. This version of it runs under X and was written using GLib/GTK+. @@ -33,11 +33,13 @@ * passive and non-passive file transfers, * drag-n-drop support, * bookmarks menu, + * support for SSH and SSH2 file transfers, + * support FXP transferts, * stop button, and many more features. Package: gftp-text Architecture: any -Depends: ${shlibs:Depends}, gftp-common (>= 2.0.8-2) +Depends: ${shlibs:Depends}, gftp-common (>= 2.0.13-1) Description: a colored FTP client using GLib gFTP is a multithreaded FTP client. This version of it runs under console and was written using GLib. @@ -52,13 +54,15 @@ * passive and non-passive file transfers, * drag-n-drop support, * bookmarks menu, + * support for SSH and SSH2 file transfers, + * support FXP transferts, * stop button, and many more features. Package: gftp-common Architecture: any Depends: gftp-gtk | gftp-text -Replaces: gftp (<< 2.0.8) -Conflicts: gftp-gtk (<< 2.0.8-2), gftp-text (<< 2.0.8-2) +Replaces: gftp (<< 2.0.13) +Conflicts: gftp-gtk (<< 2.0.13-1), gftp-text (<< 2.0.13-1) Description: shared files for other gFTP packages gFTP is a multithreaded FTP client. This package contains the locale data used by both gftp-gtk and gftp-text, along with a common manual page. @@ -73,4 +77,6 @@ * passive and non-passive file transfers, * drag-n-drop support, * bookmarks menu, + * support for SSH and SSH2 file transfers, + * support FXP transferts, * stop button, and many more features.
--- a/debian/copyright Thu Oct 03 12:06:18 2002 +0000 +++ b/debian/copyright Mon Oct 07 10:40:43 2002 +0000 @@ -1,6 +1,6 @@ This package was originally debianized by Martin Schulze on 5 Jan 1999, and -later maintained by Brian E. Ermovick. Today, it's maintained by Josip Rodin -<jrodin@jagor.srce.hr>. +later maintained by Brian E. Ermovick and then Josip Rodin. Today, it's +maintained by Aurelien Beaujean <aure@debian.org> Original source can be found at: http://gftp.seul.org/
--- a/debian/docs Thu Oct 03 12:06:18 2002 +0000 +++ b/debian/docs Mon Oct 07 10:40:43 2002 +0000 @@ -1,1 +1,5 @@ -ChangeLog README TODO +README +TODO +ABOUT-NLS +THANKS +docs/USERS-GUIDE
--- a/debian/menu Thu Oct 03 12:06:18 2002 +0000 +++ b/debian/menu Mon Oct 07 10:40:43 2002 +0000 @@ -1,1 +1,1 @@ -?package(gftp): needs=X11 section="Apps/Net" title="gFTP" command="gftp" +?package(gftp): needs=X11 section="Apps/Net" icon="/usr/share/gftp/gftp-mini-logo.xpm" title="gFTP" command="gftp"
--- a/debian/rules Thu Oct 03 12:06:18 2002 +0000 +++ b/debian/rules Mon Oct 07 10:40:43 2002 +0000 @@ -4,7 +4,7 @@ arch := $(shell dpkg-architecture -qDEB_BUILD_ARCH) #export DH_VERBOSE=1 -export DH_COMPAT=2 +export DH_COMPAT=3 ggtmp := $(CURDIR)/debian/gftp-gtk gttmp := $(CURDIR)/debian/gftp-text @@ -20,14 +20,15 @@ build: build-stamp build-stamp: dh_testdir - CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir='$${prefix}/share/man' + CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir='$${prefix}/share/man' --enable-textport=yes $(MAKE) touch $@ clean: dh_testdir dh_testroot - rm -f debian/dirs debian/docs +# rm -f debian/dirs debian/docs + rm -f debian/dirs [ ! -f Makefile ] || $(MAKE) distclean dh_clean build-stamp @@ -40,6 +41,18 @@ dh_movefiles --sourcedir=debian/gftp-gtk -pgftp-common \ usr/share/locale usr/share/gftp/gftprc usr/share/gftp/bookmarks \ usr/share/man/man1/gftp.1 usr/bin/gftp + dh_installdirs -pgftp-common usr/lib/menu + + # Install menu file manualy into the gftp-common file because + # dh_installmenu cannot do it for me + install -p -m644 debian/menu debian/gftp-common/usr/lib/menu/gftp + echo "# Automatically added by dh_installmenu">> debian/gftp-common.postinst.debhelper + sed "" /usr/share/debhelper/autoscripts/postinst-menu >> debian/gftp-common.postinst.debhelper + echo '# End automatically added section' >> debian/gftp-common.postinst.debhelper + echo "# Automatically added by dh_installmenu">> debian/gftp-common.postrm.debhelper + sed "" /usr/share/debhelper/autoscripts/postrm-menu >> debian/gftp-common.postrm.debhelper + echo '# End automatically added section' >> debian/gftp-common.postrm.debhelper + dh_movefiles --sourcedir=debian/gftp-gtk -pgftp-text usr/bin/gftp-text dh_installdirs -pgftp-text usr/share/man/man1 ln -s gftp.1.gz $(gttmp)/usr/share/man/man1/gftp-text.1.gz @@ -55,8 +68,8 @@ dh_testroot dh_installdocs -a dh_installdocs -An -pgftp-gtk -pgftp-text README TODO -# dh_installchangelogs -a ChangeLog - dh_installmenu -a + dh_installchangelogs -a ChangeLog + #dh_installmenu -a --package=gftp-common ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" "" dh_strip -a endif
--- a/lib/bookmark.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/bookmark.c Mon Oct 07 10:40:43 2002 +0000 @@ -1,5 +1,5 @@ /*****************************************************************************/ -/* local.c - functions that will use the local system */ +/* bookmark.c - functions for connecting to a site via a bookmark */ /* Copyright (C) 1998-2002 Brian Masney <masneyb@gftp.org> */ /* */ /* This program is free software; you can redistribute it and/or modify */ @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp.h" +static const char cvsid[] = "$Id$"; static int bookmark_parse_url ( gftp_request * request, const char * url );
--- a/lib/cache.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/cache.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,7 +18,7 @@ /*****************************************************************************/ #include "gftp.h" - +static const char cvsid[] = "$Id$"; char * gftp_cache_get_url_prefix (gftp_request * request)
--- a/lib/config_file.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/config_file.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp.h" +static const char cvsid[] = "$Id$"; static void write_comment ( FILE * fd, const char *comment );
--- a/lib/gftp.h Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/gftp.h Mon Oct 07 10:40:43 2002 +0000 @@ -17,6 +17,8 @@ /* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /*****************************************************************************/ +/* $Id$ */ + #ifndef __GFTP_H #define __GFTP_H
--- a/lib/local.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/local.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp.h" +static const char cvsid[] = "$Id$"; static void local_destroy ( gftp_request * request ); static void local_remove_key ( gpointer key,
--- a/lib/misc.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/misc.c Mon Oct 07 10:40:43 2002 +0000 @@ -19,6 +19,7 @@ #include "gftp.h" #include "options.h" +static const char cvsid[] = "$Id$"; char * insert_commas (off_t number, char *dest_str, size_t dest_len)
--- a/lib/options.h Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/options.h Mon Oct 07 10:40:43 2002 +0000 @@ -17,6 +17,8 @@ /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA */ /*****************************************************************************/ +/* $Id$ */ + #include "gftp.h" supported_gftp_protocols gftp_protocols[] =
--- a/lib/protocols.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/protocols.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp.h" +static const char cvsid[] = "$Id$"; static time_t parse_time ( char **str ); static int gftp_parse_ls_eplf ( char *str,
--- a/lib/rfc2068.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/rfc2068.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp.h" +static const char cvsid[] = "$Id$"; static int rfc2068_connect ( gftp_request * request ); static void rfc2068_disconnect ( gftp_request * request );
--- a/lib/rfc959.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/rfc959.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp.h" +static const char cvsid[] = "$Id$"; static int rfc959_connect ( gftp_request * request ); static void rfc959_disconnect ( gftp_request * request );
--- a/lib/ssh.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/ssh.c Mon Oct 07 10:40:43 2002 +0000 @@ -21,6 +21,7 @@ /* on the remote. Some of this code is derived from the sftp client */ #include "gftp.h" +static const char cvsid[] = "$Id$"; #define CHDIR 10 #define GETDIR 11
--- a/lib/sshv2.c Thu Oct 03 12:06:18 2002 +0000 +++ b/lib/sshv2.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp.h" +static const char cvsid[] = "$Id$"; #define SSH_MAX_HANDLE_SIZE 256 #define SSH_MAX_STRING_SIZE 34000
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/m4/Makefile.am Mon Oct 07 10:40:43 2002 +0000 @@ -0,0 +1,1 @@ +EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
--- a/po/ChangeLog Thu Oct 03 12:06:18 2002 +0000 +++ b/po/ChangeLog Mon Oct 07 10:40:43 2002 +0000 @@ -1,3 +1,9 @@ +2002-10-03 Brian Masney <masneyb@gftp.org> + * no.po, pt_BR.po, sv.po, zh_CN.po - remove fuzzy from PO header + + * Fixed typos in Dutch translation (from Myckel Habets + <myckelhabets@netscape.net>) + 2002-09-29 Abel Cheung <maddog@linux.org.hk> * zh_TW.po: Updated traditional Chinese translation.
--- a/po/bg.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/bg.po Mon Oct 07 10:40:43 2002 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2002-08-29 16:15+0300\n" "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n" "Language-Team: Bulgarian GNOME translation team <dict@linux.zonebg.com>\n" @@ -516,7 +516,7 @@ msgid "The color of the rest of the log messages" msgstr "Öâÿò íà æóðíàëè ñúîáùåíèÿ" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP Ãðåøêà: Ãðåøíî èìå íà êîíôèãóðàöèîíåí ôàéë%s\n" @@ -535,7 +535,7 @@ msgid "Did you do a make install?\n" msgstr "Èñêàòå ëè äà èíñòàëèðàòå?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP Ãðåøêà: Íå ìîãà äà îòâîðÿ êîíôèãóðàöèîíåí ôàéë %s: %s\n" @@ -555,7 +555,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "gFTP Ïðåäóïðåæäåíèå: Íå ìîãà äà îòâîðÿ %s çà çàïèñ: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP Ãðåøêà: Ãðåøåí ôàéë ñ îòìåòêè %s\n" @@ -565,7 +565,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "Ïðåäóïðåæäåíèå: Íå ìîãà äà íàìåðÿ ôàéë ñ ãëàâíè îòìåòêè %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP Ãðåøêà: Íå ìîãà äà îòâîðÿ ôàéë ñ îòìåòêè %s: %s\n" @@ -575,7 +575,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP Ïðåäóïðåæäåíèå: Ïðåñêà÷àì ðåä %d âúâ ôàéë ñ îòìåòêè: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -586,15 +586,7 @@ "ôàéë ÙÅ áúäàò ïðèïîêðèòè. Àêî çàïèñà èìà (*) â êîìåíòàðà âèå íå ìîæå äà ãî " "ñìåíèòå îò gFTP" -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"Ôàéë ñ îòìåòêè çà gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Ïðåäóïðåæäåíèå: Âñè÷êè êîìåíòàðè êîèòî ïðàâèòå ÙÅ áúäàò ïðèïîêðèòè" - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -604,7 +596,7 @@ "èçïîëçâà ïðîêñè ñúðâúð (àêî å íàëè÷åí). Ñèíòàêñèñ: dont_use_proxy=äîìåéí èëè " "dont_use_proxy=ìðåæà/ìàñêà" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -613,11 +605,19 @@ "ïðåãëåä. Áåëåæêà Âñè÷êè àðãóìåíòè ñ èçêëþ÷åíèå íà ðàçøèðåíèå íà ôàéëà ñà " "îïöèîíàëíè" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "Òàçè ñåêöèÿ ñúäúðæà äàííèòå êîèòî ñà â èñòîðèÿòà" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"Ôàéë ñ îòìåòêè çà gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Ïðåäóïðåæäåíèå: Âñè÷êè êîìåíòàðè êîèòî ïðàâèòå ÙÅ áúäàò ïðèïîêðèòè" + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP Ïðåäóïðåæäåíèå: Ðåä %d íÿìà äîñòàòú÷íî àðãóìåíòè\n"
--- a/po/cs.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/cs.po Mon Oct 07 10:40:43 2002 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gFTP 2.0.8pre4\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2001-04-10 18:52+02:00\n" "Last-Translator: Petr Domansky <doman@atlas.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -503,7 +503,7 @@ msgid "The color of the rest of the log messages" msgstr "" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "Chyba gFTP: ©patné jméno konfiguraèního souboru %s\n" @@ -522,7 +522,7 @@ msgid "Did you do a make install?\n" msgstr "Chcete spustit instalaci?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "Chyba gFTP: Nelze otevøít konfiguraèní soubor %s: %s\n" @@ -542,7 +542,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "Varování: Nelze otevøít %s pro zápis: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "Chyba gFTP: ©patné jméno souboru zálo¾ek %s\n" @@ -552,7 +552,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "Varování: Nelze najít hlavní soubor zálo¾ek %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "Chyba gFTP: Nelze otevøít soubor zálo¾ek %s: %s\n" @@ -562,7 +562,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "Varování gFTP: Vynechávám øádek %d v souboru zálo¾ek: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 #, fuzzy msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -577,7 +577,30 @@ "gFTP\n" "\n" +#: lib/config_file.c:776 +msgid "" +"This section specifies which hosts are on the local subnet and won't need to " +"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " +"dont_use_proxy=network number/netmask" +msgstr "" +"Tato sekce specifikuje jména hostitelù lokální podsítì , kteøí nemusí " +"pou¾ívat proxy server (pokud je k dispozici). Syntaxe: dont_use_proxy=." +"doména nebo dont_use_proxy=èíslo sí»ì/netmask" + #: lib/config_file.c:777 +msgid "" +"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " +"All arguments except the file extension are optional" +msgstr "" +"ext=roz¹íøení názvu souboru:XPM soubor:Ascii nebo binární (A nebo B):" +"prohlí¾ecí program. Poznámka: V¹echny parametry pro ro¹íøené názvy souborù " +"jsou volitelné" + +#: lib/config_file.c:778 +msgid "This section contains the data that is in the history" +msgstr "Tato sekce obsahuje data s historií pøístupù" + +#: lib/config_file.c:900 #, fuzzy msgid "" "Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -589,30 +612,7 @@ "pøepsány\n" "\n" -#: lib/config_file.c:778 -msgid "" -"This section specifies which hosts are on the local subnet and won't need to " -"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " -"dont_use_proxy=network number/netmask" -msgstr "" -"Tato sekce specifikuje jména hostitelù lokální podsítì , kteøí nemusí " -"pou¾ívat proxy server (pokud je k dispozici). Syntaxe: dont_use_proxy=." -"doména nebo dont_use_proxy=èíslo sí»ì/netmask" - -#: lib/config_file.c:779 -msgid "" -"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " -"All arguments except the file extension are optional" -msgstr "" -"ext=roz¹íøení názvu souboru:XPM soubor:Ascii nebo binární (A nebo B):" -"prohlí¾ecí program. Poznámka: V¹echny parametry pro ro¹íøené názvy souborù " -"jsou volitelné" - -#: lib/config_file.c:780 -msgid "This section contains the data that is in the history" -msgstr "Tato sekce obsahuje data s historií pøístupù" - -#: lib/config_file.c:1005 +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "Varování gFTP: Øádek %d neobsahuje ¾ádné argumenty\n"
--- a/po/da.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/da.po Mon Oct 07 10:40:43 2002 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp-2.0.9\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2001-11-21 23:55+0100\n" "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n" "Language-Team: Danish <sslug-locale@sslug.dk>\n" @@ -481,7 +481,7 @@ msgid "The color of the rest of the log messages" msgstr "" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP fejl: Dårligt konfigfilnavn %s\n" @@ -500,7 +500,7 @@ msgid "Did you do a make install?\n" msgstr "Kørte du \"make install\"?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP fejl: Kan ikke åbne konfigfil %s: %s\n" @@ -520,7 +520,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "Advarsel: Kan ikke tolke filoversigt %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP fejl: Dårligt bogmærkefilnavn %s\n" @@ -530,7 +530,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "Advarsel: Kan ikke finde hovedbogmærkefil %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP fejl: Kan ikke åbne bogmærkefil %s: %s\n" @@ -540,37 +540,37 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP advarsel: Springer over linie %d i bogmærkefil: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " "If a entry has a (*) in it's comment, you can't change it inside gFTP" msgstr "" -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " "dont_use_proxy=network number/netmask" msgstr "" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" msgstr "" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "Denne sektion indeholder den data som er i historien" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP advarsel: Linie %d har ikke nok argumenter\n"
--- a/po/de.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/de.po Mon Oct 07 10:40:43 2002 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp-2.0.13\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2002-07-15 08:44+0100\n" "Last-Translator: Bernd Leibing <bernd.leibing@rz.uni-ulm.de>\n" "Language-Team:German\n" @@ -588,7 +588,7 @@ msgstr "Farbe der restlichen Protokolleinträge" # config_file.c:1016 config_file.c:1362 -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP-Fehler: Falscher Name der Konfigurationsdatei %s\n" @@ -611,7 +611,7 @@ msgstr "Haben Sie das Programm installiert?\n" # config_file.c:1040 config_file.c:1205 config_file.c:1366 -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP-Fehler: Kann Konfigurationsdatei %s nicht öffnen: %s\n" @@ -635,7 +635,7 @@ msgstr "gFTP-Warnung: Kann %s nicht zum Schreiben öffnen: %s\n" # config_file.c:1182 config_file.c:1374 -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP-Fehler: Falscher Name der Lesezeichendatei %s\n" @@ -647,7 +647,7 @@ msgstr "Warnung: Kann Haupt-Lesezeichendatei %s nicht finden\n" # config_file.c:1378 -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP-Fehler: Kann Lesezeichendatei %s nicht öffnen: %s\n" @@ -659,7 +659,7 @@ msgstr "gFTP-Warnung: Überspringe Zeile %d in Lesezeichendatei: %s\n" # config_file.c:1356 -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -670,18 +670,8 @@ "hinzufügen,werden ÜBERSCHRIEBEN. Einträge, die mit einem (*) im Kommentar " "gekennzeichnet sind, können Sie nicht mittels gFTP ändern" -# config_file.c:1357 -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"Lesezeichendatei für gFTP. Copyright (C) 1998-2002 Brian Masney " -"<masneyb@gftp.org>. Warnung: Alle Kommentare, die Sie dieser Datei " -"hinzufügen, werden ÜBERSCHRIEBEN" - # config_file.c:1358 -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -692,7 +682,7 @@ "dont_use_proxy=.domain oder dont_use_proxy=netzwerknummer/netzmaske" # config_file.c:1359 -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -701,12 +691,22 @@ "Hinweis: Alle Angaben außer der Dateiendung sind optional" # config_file.c:1360 -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "Dieser Abschnitt enthält die Daten in der Chronik" +# config_file.c:1357 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"Lesezeichendatei für gFTP. Copyright (C) 1998-2002 Brian Masney " +"<masneyb@gftp.org>. Warnung: Alle Kommentare, die Sie dieser Datei " +"hinzufügen, werden ÜBERSCHRIEBEN" + # config_file.c:1556 -#: lib/config_file.c:1005 +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP-Warnung: In Zeile %d haben Sie nicht genug Argumente angegeben\n"
--- a/po/es.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/es.po Mon Oct 07 10:40:43 2002 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2002-07-20 19:43GMT\n" "Last-Translator: Gustavo D. Vranjes <gvranjes@SoftHome.net>\n" "Language-Team: Castellano <es@li.org>\n" @@ -522,7 +522,7 @@ msgid "The color of the rest of the log messages" msgstr "El color del resto de los mensajes de bitácora" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "Error de gFTP: Nombre del fichero de configuración %s incorrecto\n" @@ -542,7 +542,7 @@ msgid "Did you do a make install?\n" msgstr "¿Hizo un `make install`?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "Error de gFTP: No se puede abrir el fichero de configuración %s: %s\n" @@ -563,7 +563,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "Advertencia de gFTP: No se puede abrir %s para escribir: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "Error de gFTP: Nombre incorrecto para el fichero de marcadores %s\n" @@ -574,7 +574,7 @@ msgstr "" "Advertencia: No se puede encontrar el fichero maestro de marcadores %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "Error de gFTP: No se puede abrir el fichero de marcadores %s: %s\n" @@ -585,7 +585,7 @@ msgstr "" "Advertencia de gFTP: Ignorando línea %d del archivo de marcadores: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -596,16 +596,7 @@ "archivo SERÁ sobreescrito. Si una entrada tiene un (*) en su comentario, " "usted no podrá cambiarlo desde dentro de gFTP" -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"Archivo de marcadores para gFTP. Copyright (C) 1998-2002 Brian Masney " -"<masneyb@gftp.org>. Advertencia: Cualquier comentario que usted añada a este " -"archivo SERÁ sobreescrito" - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -615,7 +606,7 @@ "local y no es necesario acceder a ellos a través del proxy (si lo hay). " "Sintaxis: dont_use_proxy=.dominio o dont_use_proxy=número_red/máscara" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -624,11 +615,20 @@ "visualización Nota: Todos los argumentos excepto la extensión del fichero " "son opcionales" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "Esta sección contiene los datos de bitácora" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"Archivo de marcadores para gFTP. Copyright (C) 1998-2002 Brian Masney " +"<masneyb@gftp.org>. Advertencia: Cualquier comentario que usted añada a este " +"archivo SERÁ sobreescrito" + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "Advertencia de gFTP: La línea %d no tiene suficientes argumentos\n"
--- a/po/fi.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/fi.po Mon Oct 07 10:40:43 2002 +0000 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: gFTP 2.0.5\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date:\n" "Last-Translator:Tuomo Lukka <Luigi@iki.fi>\n" "Language-Team:Finnish\n" @@ -544,7 +544,7 @@ msgid "The color of the rest of the log messages" msgstr "" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP Virhe: Virheellinen konfigurointitiedoston nimi %s\n" @@ -563,7 +563,7 @@ msgid "Did you do a make install?\n" msgstr "Oletko asentanut ohjelman komennolla \"make install\"?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP Virhe: Konfigurointitiedoston %s avaaminen epäonnistui: %s\n" @@ -583,7 +583,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "gFTP Virhe: Pääkonfigurointitiedostoa ei löydy %s \n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, fuzzy, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP Virhe: Virheellinen konfigurointitiedoston nimi %s\n" @@ -593,7 +593,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "gFTP Virhe: Pääkonfigurointitiedostoa ei löydy %s \n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, fuzzy, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP Virhe: Konfigurointitiedoston %s avaaminen epäonnistui: %s\n" @@ -603,7 +603,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP Varoitus: Rivi %d ohitettu konfigurointitiedostossa: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 #, fuzzy msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -617,9 +617,31 @@ "# Jos optio on merkitty merkillä (*), sitä ei voi muuttaa gFTP ohjelmasta.\n" "\n" +#: lib/config_file.c:776 +msgid "" +"This section specifies which hosts are on the local subnet and won't need to " +"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " +"dont_use_proxy=network number/netmask" +msgstr "" + #: lib/config_file.c:777 #, fuzzy msgid "" +"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " +"All arguments except the file extension are optional" +msgstr "" +"\n" +"ext=tiedostopääte:XPM tiedosto:Ascii tai Binääri (A tai B):katselu " +"ohjelmaKaikki argumentit tiedostopäätettä lukuunottamatta ovat " +"vapaaehtoisia.\n" + +#: lib/config_file.c:778 +msgid "This section contains the data that is in the history" +msgstr "" + +#: lib/config_file.c:900 +#, fuzzy +msgid "" "Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten" msgstr "" @@ -630,29 +652,7 @@ "# Jos optio on merkitty merkillä (*), sitä ei voi muuttaa gFTP ohjelmasta.\n" "\n" -#: lib/config_file.c:778 -msgid "" -"This section specifies which hosts are on the local subnet and won't need to " -"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " -"dont_use_proxy=network number/netmask" -msgstr "" - -#: lib/config_file.c:779 -#, fuzzy -msgid "" -"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " -"All arguments except the file extension are optional" -msgstr "" -"\n" -"ext=tiedostopääte:XPM tiedosto:Ascii tai Binääri (A tai B):katselu " -"ohjelmaKaikki argumentit tiedostopäätettä lukuunottamatta ovat " -"vapaaehtoisia.\n" - -#: lib/config_file.c:780 -msgid "This section contains the data that is in the history" -msgstr "" - -#: lib/config_file.c:1005 +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP Varoitus: Rivillä %d ei ole tarpeeksi argumentteja\n"
--- a/po/fr.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/fr.po Mon Oct 07 10:40:43 2002 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2002-09-18 00:20+0200\n" "Last-Translator: Damien Mascré <damienmascre@free.fr>\n" "Language-Team: French <fr@li.org>\n" @@ -528,7 +528,7 @@ msgid "The color of the rest of the log messages" msgstr "La couleur des autres messages du journal de bord" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "Erreur gFTP : mauvais nom de fichier de configuration %s\n" @@ -548,7 +548,7 @@ msgid "Did you do a make install?\n" msgstr "Avez-vous fait un 'make install' ?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "Erreur gFTP : ne peut ouvrir le fichier de configuration %s : %s\n" @@ -569,7 +569,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "Avertissement gFTP : ne peut ouvrir %s en écriture %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "Erreur gFTP : mauvais nom de fichier des signets %s\n" @@ -579,7 +579,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "Avertissement : ne peut trouver le fichier principal des signets %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "Erreur gFTP : ne peut ouvrir le fichier des signets %s : %s\n" @@ -590,7 +590,7 @@ msgstr "" "Avertissement gFTP : ligne %d ignorée dans le fichier des signets : %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -601,16 +601,7 @@ "fichier SERONT ecrasés. Si un enregistrement a un (*) dans son commentaire, " "vous ne pouvez pas le changer à partir de la fenêtre de gFTP." -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"Fichier des signets pour gFTP. Copyright (C) 1998-2002 Brian Masney " -"<masneyb@gftp.org>. Attention : les commentaires que vous ajouterez à ce " -"fichier SERONT ecrasés." - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -620,7 +611,7 @@ "besoin de passer au travers du serveur proxy (si disponible). Syntaxe : " "dont_use_proxy=.domaine ou dont_use_proxy=adresse/masque de réseau" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -629,11 +620,20 @@ "visualisation. Note : tous les arguments, sauf l'extension du fichier, sont " "facultatifs" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "Cette section contient les informations de l'historique" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"Fichier des signets pour gFTP. Copyright (C) 1998-2002 Brian Masney " +"<masneyb@gftp.org>. Attention : les commentaires que vous ajouterez à ce " +"fichier SERONT ecrasés." + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr ""
--- a/po/it.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/it.po Mon Oct 07 10:40:43 2002 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp-2.0.7b\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2001-03-20 23:50+0100\n" "Last-Translator: Gabriele Stella <gstella@libero.it>\n" "Language-Team: Italian <it@li.org>\n" @@ -505,7 +505,7 @@ msgid "The color of the rest of the log messages" msgstr "" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "Errore gFTP: Nome file configurazione non valido %s\n" @@ -524,7 +524,7 @@ msgid "Did you do a make install?\n" msgstr "Avete eseguito un make install?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "Errore gFTP: Impossibile aprire il file di configurazione %s: %s\n" @@ -544,7 +544,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "Attenzione: Impossibile aprire %s in scrittura: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "Errore gFTP: Nome file bookmarks errato %s\n" @@ -554,7 +554,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "Attenzione: Non trovato il file dei bookmark principale %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "Errore gFTP: Impossibile aprire il file dei bookmark %s: %s\n" @@ -564,7 +564,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "Avviso gFTP: Salto la riga %d nel file dei bookmarks: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 #, fuzzy msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -577,7 +577,29 @@ "# Se una voce ha un (*) nel commento, non potete cambiarla usando gFTP\n" "\n" +#: lib/config_file.c:776 +msgid "" +"This section specifies which hosts are on the local subnet and won't need to " +"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " +"dont_use_proxy=network number/netmask" +msgstr "" +"Questa sezione elenca gli hosts della rete locale che non debbono essere " +"raggiunti tramite server proxy (se esiste). Sintassi: dont_use_proxy=." +"dominio o dont_use_proxy=indirizzo di rete/netmask" + #: lib/config_file.c:777 +msgid "" +"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " +"All arguments except the file extension are optional" +msgstr "" +"ext=estensione file:XPM file:Ascii o Binario (A or B):programma di " +"visualizzazione. Nota: Tutti gli argomenti tranne l'estensione sono opzionali" + +#: lib/config_file.c:778 +msgid "This section contains the data that is in the history" +msgstr "Questa sezione contiene i dati dell' history" + +#: lib/config_file.c:900 #, fuzzy msgid "" "Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -588,29 +610,7 @@ "# Attenzione: Qualsiasi commento aggiunto a questo file SARA' sovrascritto\n" "\n" -#: lib/config_file.c:778 -msgid "" -"This section specifies which hosts are on the local subnet and won't need to " -"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " -"dont_use_proxy=network number/netmask" -msgstr "" -"Questa sezione elenca gli hosts della rete locale che non debbono essere " -"raggiunti tramite server proxy (se esiste). Sintassi: dont_use_proxy=." -"dominio o dont_use_proxy=indirizzo di rete/netmask" - -#: lib/config_file.c:779 -msgid "" -"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " -"All arguments except the file extension are optional" -msgstr "" -"ext=estensione file:XPM file:Ascii o Binario (A or B):programma di " -"visualizzazione. Nota: Tutti gli argomenti tranne l'estensione sono opzionali" - -#: lib/config_file.c:780 -msgid "This section contains the data that is in the history" -msgstr "Questa sezione contiene i dati dell' history" - -#: lib/config_file.c:1005 +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "Avviso gFTP: La riga %d non ha abbastanza argomenti\n"
--- a/po/ja.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/ja.po Mon Oct 07 10:40:43 2002 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gFTP 2.0.13\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2002-09-10 01:30+0900\n" "Last-Translator: Ryoichi INAGAKI <ryo1@bc.wakwak.com>\n" "Language-Team: Japanese\n" @@ -483,7 +483,7 @@ msgid "The color of the rest of the log messages" msgstr "¤½¤Î¾¤Î¥í¥°¥á¥Ã¥»¡¼¥¸¤Î¿§" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP ¥¨¥é¡¼: ÉÔÀµ¤ÊÀßÄê¥Õ¥¡¥¤¥ë̾ %s¤Ç¤¹\n" @@ -502,7 +502,7 @@ msgid "Did you do a make install?\n" msgstr "make install ¤ò¹Ô¤¤¤Þ¤·¤¿¤«?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP¥¨¥é¡¼: ÀßÄê¥Õ¥¡¥¤¥ë %s¤¬³«¤±¤Þ¤»¤ó: %s\n" @@ -522,7 +522,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "gFTP ·Ù¹ð: ½ñ¤¹þ¤ßÍÑ¤Ë %s ¤ò³«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP ¥¨¥é¡¼: ¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë̾%s¤¬ÉÔÀµ¤Ç¤¹\n" @@ -532,7 +532,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "gFTP¥¨¥é¡¼: ¥Þ¥¹¥¿¡¼¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë %s¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP¥¨¥é¡¼: ¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë %s¤¬³«¤±¤Þ¤»¤ó: %s\n" @@ -542,7 +542,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP·Ù¹ð: ¥Ö¥Ã¥¯¥Þ¡¼¥¯¥Õ¥¡¥¤¥ë%d¹Ô¤ò¥¹¥¥Ã¥×: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -552,7 +552,24 @@ "·Ù¹ð: ¤³¤Î¥Õ¥¡¥¤¥ë¤Ø¤¢¤Ê¤¿¤¬Äɲä·¤¿¤¹¤Ù¤Æ¤Î¥³¥á¥ó¥È¤Ï, ¾å½ñ¤¤µ¤ì¤Æ¤·¤Þ¤¤¤Þ" "¤¹. ¥³¥á¥ó¥È¤Ë (*) ¤ò¤â¤Ä¹àÌܤÏ, gFTP¤ÎÃæ¤Ç ¤½¤ì¤òÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó." +#: lib/config_file.c:776 +msgid "" +"This section specifies which hosts are on the local subnet and won't need to " +"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " +"dont_use_proxy=network number/netmask" +msgstr "" + #: lib/config_file.c:777 +msgid "" +"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " +"All arguments except the file extension are optional" +msgstr "" + +#: lib/config_file.c:778 +msgid "This section contains the data that is in the history" +msgstr "¤³¤Î¥»¥¯¥·¥ç¥ó¤Ï¥Ò¥¹¥È¥êÃæ¤Ë¤¢¤ë¥Ç¡¼¥¿¤ò´Þ¤ß¤Þ¤¹" + +#: lib/config_file.c:900 #, fuzzy msgid "" "Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -562,24 +579,7 @@ "<masneyb@gftp.org>. ·Ù¹ð: ¤³¤Î¥Õ¥¡¥¤¥ë¤Ø¤¢¤Ê¤¿¤¬Äɲä·¤¿¤¹¤Ù¤Æ¤Î¥³¥á¥ó¥È¤Ï,¾å" "½ñ¤¤µ¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹." -#: lib/config_file.c:778 -msgid "" -"This section specifies which hosts are on the local subnet and won't need to " -"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " -"dont_use_proxy=network number/netmask" -msgstr "" - -#: lib/config_file.c:779 -msgid "" -"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " -"All arguments except the file extension are optional" -msgstr "" - -#: lib/config_file.c:780 -msgid "This section contains the data that is in the history" -msgstr "¤³¤Î¥»¥¯¥·¥ç¥ó¤Ï¥Ò¥¹¥È¥êÃæ¤Ë¤¢¤ë¥Ç¡¼¥¿¤ò´Þ¤ß¤Þ¤¹" - -#: lib/config_file.c:1005 +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP·Ù¹ð: %d¹Ô¤Ï°ú¿ô¤¬Â¤ê¤Þ¤»¤ó\n"
--- a/po/ko.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/ko.po Mon Oct 07 10:40:43 2002 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp 2.0.13\n" -"POT-Creation-Date: 2002-09-17 10:31+0900\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2002-09-24 11:45+0900\n" "Last-Translator: Nam SungHyun <namsh@kldp.org>\n" "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n" @@ -502,7 +502,7 @@ msgid "The color of the rest of the log messages" msgstr "³ª¸ÓÁö ·Î±× ¸Þ½ÃÁöÀÇ »ö" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP ¿¡·¯: À߸øµÈ ¼³Á¤ ÆÄÀÏ À̸§ %s\n" @@ -521,7 +521,7 @@ msgid "Did you do a make install?\n" msgstr "ÀνºÅçÀ» Çϼ̽À´Ï±î?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP ¿¡·¯: ¼³Á¤ ÆÄÀÏ %s¸¦ ¿ ¼ö ¾ø½À´Ï´Ù: %s\n" @@ -541,7 +541,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "gFTP °æ°í: %s¸¦ ¾²±âÀ§ÇØ ¿ ¼ö ¾ø½À´Ï´Ù: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP ¿¡·¯: À߸øµÈ Ã¥°¥ÇÇ ÆÄÀÏ À̸§ %s\n" @@ -551,7 +551,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "°æ°í: ÁÖ Ã¥°¥ÇÇ ÆÄÀÏ %s¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP ¿¡·¯: Ã¥°¥ÇÇ ÆÄÀÏ %s¸¦ ¿ ¼ö ¾ø½À´Ï´Ù: %s\n" @@ -561,7 +561,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP °æ°í: Ã¥°¥ÇÇ ÆÄÀÏÀÇ %d ¶óÀÎ ¹«½Ã: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -571,15 +571,7 @@ "°í: ´ç½ÅÀÌ ÀÌ ÆÄÀÏ¿¡ Ãß°¡ÇÏ´Â ¾î¶² ÄÚ¸àÆ®µµ *µ¤¾î½áÁú* °ÍÀÔ´Ï´Ù. ÄÚ¸àÆ®¿¡ (*)" "¸¦ Æ÷ÇÔÇÏ°í ÀÖ´Â Ç׸ñÀº gFTP¾È¿¡¼ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"gFTP Ã¥°¥ÇÇ ÆÄÀÏ. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp.org>. °æ" -"°í: ´ç½ÅÀÌ ÀÌ ÆÄÀÏ¿¡ Ãß°¡ÇÏ´Â ¾î¶² ÄÚ¸àÆ®µµ *µ¤¾î½áÁú* °ÍÀÔ´Ï´Ù" - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -589,7 +581,7 @@ "·Ï½Ã ¼¹ö¸¦ »ç¿ëÇÏÁö ¾ÊÀ» °ÍÀ» ÀǹÌÇÕ´Ï´Ù. Çü½Ä: dont_use_proxy=.domain Ȥ´Â " "dont_use_proxy=³×Æ®¿öÅ© ¹øÈ£/³×Æ®¸¶½ºÅ©" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -597,11 +589,19 @@ "ext=ÆÄÀÏ È®ÀåÀÚ:XPM ÆÄÀÏ:Ascii ȤÀº Binary (A ȤÀº B):º¸±â ÇÁ·Î±×·¥. Âü°í: ÆÄ" "ÀÏ È®ÀåÀÚ¸¦ Á¦¿ÜÇÑ ³ª¸ÓÁö ÀÎÀÚµéÀº ¾ø¾îµµ µË´Ï´Ù" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "ÀÌ ¼½¼ÇÀº È÷½ºÅ丮¿¡ ÀÖÀ» ÀڷḦ Æ÷ÇÔÇÕ´Ï´Ù" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"gFTP Ã¥°¥ÇÇ ÆÄÀÏ. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp.org>. °æ" +"°í: ´ç½ÅÀÌ ÀÌ ÆÄÀÏ¿¡ Ãß°¡ÇÏ´Â ¾î¶² ÄÚ¸àÆ®µµ *µ¤¾î½áÁú* °ÍÀÔ´Ï´Ù" + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP °æ°í: %d ¶óÀÎÀº ÃæºÐÇÑ ÀÎÀÚ¸¦ °¡Áö°í ÀÖÁö ¾Ê½À´Ï´Ù\n" @@ -1027,7 +1027,7 @@ msgid "%d: Utime %s %d\n" msgstr "%d: Utime %s %d\n" -#: lib/sshv2.c:736 src/gtk/bookmarks.c:363 src/gtk/bookmarks.c:1059 +#: lib/sshv2.c:736 src/gtk/bookmarks.c:364 src/gtk/bookmarks.c:1081 #: src/gtk/chmod_dialog.c:181 src/gtk/options_dialog.c:312 #: src/gtk/options_dialog.c:686 src/gtk/transfer.c:1722 msgid "OK" @@ -1331,7 +1331,7 @@ msgid "Could not parse URL %s\n" msgstr "URL %s¸¦ Çؼ®ÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: src/text/gftp-text.c:367 src/gtk/menu-items.c:814 +#: src/text/gftp-text.c:367 src/gtk/menu-items.c:815 msgid "Translated by" msgstr "¹ø¿ªÀÚ: ³²¼ºÇö <namsh@kldp.org>" @@ -1410,8 +1410,8 @@ msgid "Error: You cannot change this variable\n" msgstr "¿¡·¯: ´ç½ÅÀº ÀÌ º¯¼ö °ªÀ» ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù\n" -#: src/gtk/bookmarks.c:72 src/gtk/gftp-gtk.c:965 src/gtk/menu-items.c:65 -#: src/gtk/menu-items.c:95 src/gtk/misc-gtk.c:458 src/gtk/misc-gtk.c:466 +#: src/gtk/bookmarks.c:72 src/gtk/gftp-gtk.c:951 src/gtk/menu-items.c:65 +#: src/gtk/menu-items.c:95 src/gtk/misc-gtk.c:461 src/gtk/misc-gtk.c:469 #, c-format msgid "%s: Please hit the stop button first to do anything else\n" msgstr "%s: ¾î¶² ÀÏÀ̵ç ÇϽ÷Á¸é ÀÏ´Ü ¸ØÃã ¹öÆ°À» ´©¸£½Ê½Ã¿ä\n" @@ -1493,88 +1493,88 @@ msgid "/File/Close" msgstr "/ÆÄÀÏ/´Ý±â" -#: src/gtk/bookmarks.c:308 src/gtk/bookmarks.c:311 +#: src/gtk/bookmarks.c:307 src/gtk/bookmarks.c:310 msgid "Edit Bookmarks" msgstr "Ã¥°¥ÇÇ ÆíÁý" -#: src/gtk/bookmarks.c:326 src/gtk/bookmarks.c:877 src/gtk/chmod_dialog.c:87 -#: src/gtk/gftp-gtk.c:116 src/gtk/menu-items.c:796 src/gtk/misc-gtk.c:864 -#: src/gtk/misc-gtk.c:954 src/gtk/options_dialog.c:102 +#: src/gtk/bookmarks.c:325 src/gtk/bookmarks.c:899 src/gtk/chmod_dialog.c:87 +#: src/gtk/gftp-gtk.c:116 src/gtk/menu-items.c:797 src/gtk/misc-gtk.c:898 +#: src/gtk/misc-gtk.c:1019 src/gtk/options_dialog.c:102 #: src/gtk/view_dialog.c:267 msgid "gFTP Icon" msgstr "gFTP ¾ÆÀÌÄÜ" -#: src/gtk/bookmarks.c:373 src/gtk/bookmarks.c:1071 src/gtk/chmod_dialog.c:193 +#: src/gtk/bookmarks.c:374 src/gtk/bookmarks.c:1093 src/gtk/chmod_dialog.c:193 #: src/gtk/options_dialog.c:323 src/gtk/options_dialog.c:697 #: src/gtk/transfer.c:1734 msgid " Cancel " msgstr " Ãë¼Ò " -#: src/gtk/bookmarks.c:743 src/gtk/bookmarks.c:753 +#: src/gtk/bookmarks.c:765 src/gtk/bookmarks.c:775 msgid "New Folder" msgstr "»õ Æú´õ" -#: src/gtk/bookmarks.c:744 +#: src/gtk/bookmarks.c:766 msgid "Enter the name of the new folder to create" msgstr "»ý¼ºÇÏ°íÀÚ ÇÏ´Â »õ·Î¿î Æú´õÀÇ À̸§À» ÀÔ·ÂÇϼ¼¿ä" -#: src/gtk/bookmarks.c:754 +#: src/gtk/bookmarks.c:776 msgid "Enter the name of the new item to create" msgstr "»ý¼ºÇÏ°íÀÚ ÇÏ´Â »õ·Î¿î Ç׸ñÀÇ À̸§À» ÀÔ·ÂÇϼ¼¿ä" -#: src/gtk/bookmarks.c:856 src/gtk/bookmarks.c:859 +#: src/gtk/bookmarks.c:878 src/gtk/bookmarks.c:881 msgid "Edit Entry" msgstr "¿£Æ®¸® ÆíÁý" -#: src/gtk/bookmarks.c:892 +#: src/gtk/bookmarks.c:914 msgid "Description:" msgstr "¼³¸í:" -#: src/gtk/bookmarks.c:907 +#: src/gtk/bookmarks.c:929 msgid "Hostname:" msgstr "È£½ºÆ®¸í:" -#: src/gtk/bookmarks.c:920 +#: src/gtk/bookmarks.c:942 msgid "Port:" msgstr "Æ÷Æ®:" -#: src/gtk/bookmarks.c:937 +#: src/gtk/bookmarks.c:959 msgid "Protocol:" msgstr "ÇÁ·ÎÅäÄÝ:" -#: src/gtk/bookmarks.c:961 +#: src/gtk/bookmarks.c:983 msgid "Remote Directory:" msgstr "¿ø°Ý µð·ºÅ丮:" -#: src/gtk/bookmarks.c:974 +#: src/gtk/bookmarks.c:996 msgid "Local Directory:" msgstr "·ÎÄà µð·ºÅ丮:" -#: src/gtk/bookmarks.c:987 +#: src/gtk/bookmarks.c:1009 msgid "Remote SSH sftp path:" msgstr "¿ø°Ý SSH sftp °æ·Î:" -#: src/gtk/bookmarks.c:1004 +#: src/gtk/bookmarks.c:1026 msgid "Username:" msgstr "»ç¿ëÀÚ¸í:" -#: src/gtk/bookmarks.c:1017 +#: src/gtk/bookmarks.c:1039 msgid "Password:" msgstr "ºñ¹Ð¹øÈ£:" -#: src/gtk/bookmarks.c:1031 +#: src/gtk/bookmarks.c:1053 msgid "Account:" msgstr "¾îÄ«¿îÆ®:" -#: src/gtk/bookmarks.c:1045 +#: src/gtk/bookmarks.c:1067 msgid "Log in as ANONYMOUS" msgstr "À͸íÀ¸·Î ·Î±×ÀÎ" -#: src/gtk/bookmarks.c:1081 src/gtk/options_dialog.c:334 +#: src/gtk/bookmarks.c:1103 src/gtk/options_dialog.c:334 msgid "Apply" msgstr "Àû¿ë" -#: src/gtk/bookmarks.c:1121 +#: src/gtk/bookmarks.c:1143 #, c-format msgid "" "Are you sure you want to erase the bookmark\n" @@ -1583,11 +1583,11 @@ "Ã¥°¥ÇÇ %s¿Í ±× ÇÏÀ§ Ç׸ñµéÀ»\n" "Á¤¸»·Î Áö¿ì°í ½ÍÀ¸½Ê´Ï±î?" -#: src/gtk/bookmarks.c:1122 +#: src/gtk/bookmarks.c:1144 msgid "Delete Bookmark" msgstr "Ã¥°¥ÇÇ »èÁ¦" -#: src/gtk/bookmarks.c:1333 +#: src/gtk/bookmarks.c:1355 msgid "Bookmarks" msgstr "Ã¥°¥ÇÇ" @@ -1620,7 +1620,7 @@ msgid "Sticky" msgstr "Sticky" -#: src/gtk/chmod_dialog.c:120 src/gtk/gftp-gtk.c:736 +#: src/gtk/chmod_dialog.c:120 src/gtk/gftp-gtk.c:728 msgid "User" msgstr "»ç¿ëÀÚ" @@ -1639,7 +1639,7 @@ msgid "Execute" msgstr "½ÇÇà" -#: src/gtk/chmod_dialog.c:140 src/gtk/gftp-gtk.c:737 +#: src/gtk/chmod_dialog.c:140 src/gtk/gftp-gtk.c:729 msgid "Group" msgstr "±×·ì" @@ -1648,7 +1648,7 @@ msgstr "Other" #: src/gtk/chmod_dialog.c:337 src/gtk/delete_dialog.c:230 -#: src/gtk/menu-items.c:575 src/gtk/mkdir_dialog.c:65 +#: src/gtk/menu-items.c:576 src/gtk/mkdir_dialog.c:65 #: src/gtk/rename_dialog.c:66 src/gtk/transfer.c:514 msgid "Operation canceled\n" msgstr "µ¿ÀÛÀÌ Ãë¼ÒµÇ¾ú½À´Ï´Ù\n" @@ -1702,7 +1702,7 @@ "Àü¼ÛÁßÀÎ ÆÄÀÏÀÌ ÀÖ½À´Ï´Ù.\n" "Á¤¸»·Î Á¾·áÇϱ⸦ ¿øÇϽʴϱî?" -#: src/gtk/gftp-gtk.c:253 src/gtk/gftp-gtk.c:734 src/gtk/transfer.c:1577 +#: src/gtk/gftp-gtk.c:253 src/gtk/gftp-gtk.c:726 src/gtk/transfer.c:1577 msgid "Filename" msgstr "ÆÄÀϸí" @@ -2034,23 +2034,23 @@ msgid "Pass: " msgstr "ºñ¹Ð¹øÈ£: " -#: src/gtk/gftp-gtk.c:735 +#: src/gtk/gftp-gtk.c:727 msgid "Size" msgstr "Å©±â" -#: src/gtk/gftp-gtk.c:738 +#: src/gtk/gftp-gtk.c:730 msgid "Date" msgstr "³¯Â¥" -#: src/gtk/gftp-gtk.c:739 +#: src/gtk/gftp-gtk.c:731 msgid "Attribs" msgstr "¼Ó¼º" -#: src/gtk/gftp-gtk.c:966 src/gtk/misc-gtk.c:837 +#: src/gtk/gftp-gtk.c:952 src/gtk/misc-gtk.c:871 src/gtk/misc-gtk.c:939 msgid "Connect" msgstr "¿¬°á" -#: src/gtk/gftp-gtk.c:985 +#: src/gtk/gftp-gtk.c:971 msgid "Error: You must type in a host to connect to\n" msgstr "¿¡·¯: ¿¬°áÇÏ·Á¸é È£½ºÆ®¸íÀ» ÀÔ·ÂÇÏ¼Å¾ß ÇÕ´Ï´Ù\n" @@ -2082,7 +2082,7 @@ msgid "Enter the new file specification" msgstr "»õ·Î¿î ÆÄÀÏ ¸í¼¼¸¦ ÀÔ·ÂÇϽʽÿä" -#: src/gtk/menu-items.c:231 src/gtk/menu-items.c:635 src/gtk/menu-items.c:691 +#: src/gtk/menu-items.c:231 src/gtk/menu-items.c:636 src/gtk/menu-items.c:692 #: src/gtk/view_dialog.c:70 src/gtk/view_dialog.c:140 #, c-format msgid "Error: Cannot open %s for writing: %s\n" @@ -2092,37 +2092,37 @@ msgid "Save Directory Listing" msgstr "µð·ºÅ丮 ¸ñ·Ï ÀúÀå" -#: src/gtk/menu-items.c:397 +#: src/gtk/menu-items.c:398 msgid "SITE: Operation canceled...you must enter a string\n" msgstr "SITE: µ¿ÀÛÀÌ Ãë¼ÒµÇ¾ú½À´Ï´Ù...¹®ÀÚ¿À» ÀÔ·ÂÇÏ¼Å¾ß ÇÕ´Ï´Ù\n" -#: src/gtk/menu-items.c:416 src/gtk/menu-items.c:419 +#: src/gtk/menu-items.c:417 src/gtk/menu-items.c:420 msgid "Site" msgstr "»çÀÌÆ®" -#: src/gtk/menu-items.c:419 +#: src/gtk/menu-items.c:420 msgid "Enter site-specific command" msgstr "»çÀÌÆ® ¸í·É ÀÔ·Â" -#: src/gtk/menu-items.c:439 src/gtk/menu-items.c:473 +#: src/gtk/menu-items.c:440 src/gtk/menu-items.c:474 msgid "Chdir" msgstr "Chdir" -#: src/gtk/menu-items.c:658 src/gtk/menu-items.c:714 +#: src/gtk/menu-items.c:659 src/gtk/menu-items.c:715 #, c-format msgid "Error: Error writing to %s: %s\n" msgstr "¿¡·¯: %s¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù: %s\n" -#: src/gtk/menu-items.c:724 +#: src/gtk/menu-items.c:725 #, c-format msgid "Successfully wrote the log file to %s\n" msgstr "·Î±×ÆÄÀÏÀ» %s¿¡ ¼º°øÀûÀ¸·Î ÀúÀåÇß½À´Ï´Ù\n" -#: src/gtk/menu-items.c:736 +#: src/gtk/menu-items.c:737 msgid "Save Log" msgstr "·Î±× ÀúÀå" -#: src/gtk/menu-items.c:772 +#: src/gtk/menu-items.c:773 #, c-format msgid "" "Cannot find the license agreement file COPYING. Please make sure it is in " @@ -2131,11 +2131,11 @@ "¶óÀ̼±½º µ¿ÀÇ ÆÄÀÏ COPYINGÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù. ÀÌ ÆÄÀÏÀÌ %s ȤÀº %s¿¡ ÀÖ¾î¾ß " "ÇÕ´Ï´Ù" -#: src/gtk/menu-items.c:776 src/gtk/menu-items.c:781 +#: src/gtk/menu-items.c:777 src/gtk/menu-items.c:782 msgid "About gFTP" msgstr "gFTP¿¡ ´ëÇÏ¿©" -#: src/gtk/menu-items.c:812 +#: src/gtk/menu-items.c:813 #, c-format msgid "" "%s\n" @@ -2148,90 +2148,98 @@ "°øÀûÀΠȨÆäÀÌÁö: http://www.gftp.org/\n" "·Î°í ¸¸µçÀÌ: Aaron Worley <planet_hoth@yahoo.com>\n" -#: src/gtk/menu-items.c:825 +#: src/gtk/menu-items.c:826 msgid "About" msgstr "ÀÌ ÇÁ·Î±×·¥Àº" -#: src/gtk/menu-items.c:874 +#: src/gtk/menu-items.c:875 msgid "License Agreement" msgstr "¶óÀ̼±½º µ¿ÀÇ" -#: src/gtk/menu-items.c:880 src/gtk/view_dialog.c:314 +#: src/gtk/menu-items.c:881 src/gtk/view_dialog.c:314 msgid " Close " msgstr " ´Ý±â " -#: src/gtk/menu-items.c:962 +#: src/gtk/menu-items.c:963 msgid "Compare Windows" msgstr "â ºñ±³" -#: src/gtk/misc-gtk.c:187 +#: src/gtk/misc-gtk.c:190 msgid "Refresh" msgstr "Àç»ý" -#: src/gtk/misc-gtk.c:254 +#: src/gtk/misc-gtk.c:257 msgid "All Files" msgstr "¸ðµç ÆÄÀÏ" -#: src/gtk/misc-gtk.c:260 +#: src/gtk/misc-gtk.c:263 msgid "] (Cached) [" msgstr "] (ij½¬µÊ) [" -#: src/gtk/misc-gtk.c:274 +#: src/gtk/misc-gtk.c:277 msgid "Not connected" msgstr "¿¬°á ¾ÊµÊ" -#: src/gtk/misc-gtk.c:384 +#: src/gtk/misc-gtk.c:387 #, c-format msgid "Error opening file %s: %s\n" msgstr "ÆÄÀÏ %s¸¦ ¿ ¼ö ¾ø½À´Ï´Ù: %s\n" -#: src/gtk/misc-gtk.c:474 +#: src/gtk/misc-gtk.c:477 #, c-format msgid "%s: Not connected to a remote site\n" msgstr "%s: ¸®¸ðÆ® »çÀÌÆ®¿¡ ¿¬°áµÇÁö ¾Ê¾Ò½À´Ï´Ù\n" -#: src/gtk/misc-gtk.c:481 +#: src/gtk/misc-gtk.c:484 #, c-format msgid "%s: This feature is not available using this protocol\n" msgstr "%s: ÀÌ ±â´ÉÀº ÀÌ ÇÁ·ÎÅäÄÝÀ» »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù\n" -#: src/gtk/misc-gtk.c:489 +#: src/gtk/misc-gtk.c:492 #, c-format msgid "%s: You must only have one item selected\n" msgstr "%s: ÇÑ Ç׸ñ¸¸ ¼±ÅÃÇÏ¼Å¾ß ÇÕ´Ï´Ù\n" -#: src/gtk/misc-gtk.c:496 +#: src/gtk/misc-gtk.c:499 #, c-format msgid "%s: You must have at least one item selected\n" msgstr "%s: Àû¾îµµ ÇÑ Ç׸ñÀº ¼±ÅÃÇÏ¼Å¾ß ÇÕ´Ï´Ù\n" -#: src/gtk/misc-gtk.c:834 +#: src/gtk/misc-gtk.c:868 src/gtk/misc-gtk.c:936 msgid "Change" msgstr "¼öÁ¤" -#: src/gtk/misc-gtk.c:840 src/gtk/rename_dialog.c:109 +#: src/gtk/misc-gtk.c:874 src/gtk/misc-gtk.c:942 src/gtk/rename_dialog.c:109 #: src/gtk/rename_dialog.c:121 msgid "Rename" msgstr "À̸§º¯°æ" -#. FIXME - fix call backs -#: src/gtk/misc-gtk.c:963 +#: src/gtk/misc-gtk.c:933 src/gtk/options_dialog.c:386 +msgid "Add" +msgstr "Ãß°¡" + +#: src/gtk/misc-gtk.c:959 +#, fuzzy +msgid "Cancel" +msgstr " Ãë¼Ò " + +#: src/gtk/misc-gtk.c:1029 msgid " Yes " msgstr " ¿¹ " -#: src/gtk/misc-gtk.c:973 +#: src/gtk/misc-gtk.c:1039 msgid " No " msgstr " ¾Æ´Ï¿À " -#: src/gtk/misc-gtk.c:1019 +#: src/gtk/misc-gtk.c:1079 msgid "Getting directory listings" msgstr "µð·ºÅ丮 ¸ñ·ÏÀ» ¹Þ´Â Áß" -#: src/gtk/misc-gtk.c:1039 +#: src/gtk/misc-gtk.c:1099 msgid " Stop " msgstr " ÁßÁö " -#: src/gtk/misc-gtk.c:1049 +#: src/gtk/misc-gtk.c:1109 #, c-format msgid "" "Received %ld directories\n" @@ -2268,10 +2276,6 @@ msgid "Local Hosts" msgstr "·ÎÄà ȣ½ºÆ®" -#: src/gtk/options_dialog.c:386 -msgid "Add" -msgstr "Ãß°¡" - #: src/gtk/options_dialog.c:393 src/gtk/view_dialog.c:105 msgid "Edit" msgstr "ÆíÁý"
--- a/po/nl.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/nl.po Mon Oct 07 10:40:43 2002 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp-2.0.13\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-07-19 14:50-0400\n" "PO-Revision-Date: 2002-07-20 @835\n" "Last-Translator: Myckel Habets <myckelhabets@netscape.net>\n" "Language-Team: NL-Soft <nl-soft@nl.linux.org>\n" @@ -136,8 +136,8 @@ msgid "Show hidden files in the listboxes" msgstr "Toon verborgen bestanden in de lijsten" -#: lib/config_file.c:64 src/gtk/options_dialog.c:359 -#: src/gtk/options_dialog.c:628 +#: lib/config_file.c:64 src/gtk/options_dialog.c:316 +#: src/gtk/options_dialog.c:563 msgid "Network" msgstr "Netwerk" @@ -309,7 +309,6 @@ msgstr "%pa = proxy account" #: lib/config_file.c:111 -#, c-format msgid "%ha = host account" msgstr "%ha = host account" @@ -616,108 +615,108 @@ msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP Waarschuwing: Regel %d heeft niet genoeg argumenten\n" -#: lib/local.c:161 lib/local.c:538 +#: lib/local.c:160 lib/local.c:505 #, c-format msgid "Could not change local directory to %s: %s\n" msgstr "Kan niet naar lokale directory %s gaan: %s\n" -#: lib/local.c:176 lib/local.c:526 lib/ssh.c:348 lib/ssh.c:768 +#: lib/local.c:175 lib/local.c:493 lib/ssh.c:333 lib/ssh.c:752 #, c-format msgid "Could not get current working directory: %s\n" -msgstr "Kan niet naar huidige directory gaan: %s\n" - -#: lib/local.c:193 lib/local.c:348 +msgstr "Kan niet naar huidige directory %s gaan\n" + +#: lib/local.c:192 lib/local.c:327 #, c-format msgid "Error closing file descriptor: %s\n" msgstr "Fout bij het sluiten van bestandsbeschrijver %s\n" -#: lib/local.c:222 lib/local.c:292 +#: lib/local.c:215 lib/local.c:271 #, c-format msgid "Error: Cannot open local file %s: %s\n" msgstr "Fout: Kan lokaal bestand %s: niet openen: %s\n" -#: lib/local.c:230 lib/local.c:300 +#: lib/local.c:226 lib/local.c:235 lib/local.c:244 lib/local.c:301 +#, c-format +msgid "Error: Cannot seek on file %s: %s\n" +msgstr "Fout: Kan niet naar bestand %s zoeken: %s\n" + +#: lib/local.c:279 #, c-format msgid "Cannot fdopen() socket for %s: %s\n" msgstr "Kan buis naar %s niet fdopen(): %s\n" -#: lib/local.c:242 lib/local.c:251 lib/local.c:260 lib/local.c:322 -#, c-format -msgid "Error: Cannot seek on file %s: %s\n" -msgstr "Fout: Kan niet naar bestand %s zoeken: %s\n" - -#: lib/local.c:312 +#: lib/local.c:291 #, c-format msgid "Error: Cannot truncate local file %s: %s\n" msgstr "Fout: Kan lokaal bestand %s niet beknotten: %s\n" -#: lib/local.c:485 +#: lib/local.c:452 #, c-format msgid "Could not get local directory listing %s: %s\n" msgstr "Kan geen lijst van lokale directory %s maken: %s\n" -#: lib/local.c:519 +#: lib/local.c:486 #, c-format msgid "Successfully changed local directory to %s\n" msgstr "Directory succesvol naar %s veranderd\n" -#: lib/local.c:554 lib/local.c:577 lib/ssh.c:869 lib/ssh.c:901 -#: src/gtk/transfer.c:2219 src/gtk/view_dialog.c:238 +#: lib/local.c:521 lib/local.c:544 lib/ssh.c:853 lib/ssh.c:885 +#: src/gtk/transfer.c:2249 src/gtk/view_dialog.c:236 #, c-format msgid "Successfully removed %s\n" msgstr "%s is verwijderd\n" -#: lib/local.c:560 lib/ssh.c:861 +#: lib/local.c:527 lib/ssh.c:845 #, c-format msgid "Error: Could not remove directory %s: %s\n" msgstr "Fout: Kan externe directory %s niet verwijderen: %s\n" -#: lib/local.c:583 lib/ssh.c:893 src/gtk/transfer.c:2223 -#: src/gtk/view_dialog.c:242 +#: lib/local.c:550 lib/ssh.c:877 src/gtk/transfer.c:2253 +#: src/gtk/view_dialog.c:240 #, c-format msgid "Error: Could not remove file %s: %s\n" msgstr "Fout: Kan extern bestand %s niet verwijderen: %s\n" -#: lib/local.c:600 lib/ssh.c:933 +#: lib/local.c:567 lib/ssh.c:917 #, c-format msgid "Successfully made directory %s\n" msgstr "Directory %s succesvol aangemaakt\n" -#: lib/local.c:607 lib/ssh.c:925 +#: lib/local.c:574 lib/ssh.c:909 #, c-format msgid "Error: Could not make directory %s: %s\n" msgstr "Fout: kan directory %s niet aanmaken: %s\n" -#: lib/local.c:626 lib/ssh.c:967 +#: lib/local.c:593 lib/ssh.c:951 #, c-format msgid "Successfully renamed %s to %s\n" msgstr "%s is succesvol hernoemd naar %s\n" -#: lib/local.c:633 lib/ssh.c:959 +#: lib/local.c:600 lib/ssh.c:943 #, c-format msgid "Error: Could not rename %s to %s: %s\n" msgstr "Fout: Kan %s niet naar %s hernoemen: %s\n" -#: lib/local.c:656 lib/ssh.c:1001 +#: lib/local.c:623 lib/ssh.c:985 #, c-format msgid "Successfully changed mode of %s to %d\n" msgstr "Modus succesvol veranderd van %s naar %d\n" -#: lib/local.c:663 lib/ssh.c:993 +#: lib/local.c:630 lib/ssh.c:977 #, c-format msgid "Error: Could not change mode of %s to %d: %s\n" msgstr "Fout: Kan de modus niet veranderen van %s naar %d: %s\n" -#: lib/misc.c:349 +#: lib/misc.c:345 msgid "usage: gftp [[ftp://][user:[pass]@]ftp-site[:port][/directory]]\n" msgstr "gebruik: gftp [[ftp://][gebr:wachtw@]ftp-site[:poort][/directory]]\n" -#: lib/misc.c:377 +#: lib/misc.c:373 #, c-format msgid "gFTP Error: Cannot find file %s in %s or %s\n" msgstr "gFTP Fout: Kan bestand %s niet in %s of %s vinden\n" -#: lib/misc.c:832 +#: lib/misc.c:828 #, c-format msgid "Running program %s\n" msgstr "Lopend programma %s\n" @@ -758,12 +757,12 @@ msgid "Custom" msgstr "Aangepast" -#: lib/protocols.c:255 lib/protocols.c:301 lib/rfc2068.c:268 lib/rfc959.c:845 +#: lib/protocols.c:255 lib/protocols.c:301 lib/rfc2068.c:239 lib/rfc959.c:821 #, c-format msgid "Connection to %s timed out\n" msgstr "Verbinding naar %s timeout\n" -#: lib/protocols.c:264 lib/rfc2068.c:281 +#: lib/protocols.c:264 lib/rfc2068.c:252 #, c-format msgid "Error reading from host %s: %s\n" msgstr "Fout bij lezen van host %s: %s\n" @@ -783,111 +782,104 @@ msgid "Error: Cannot write to cache: %s\n" msgstr "Fout: Kan niet naar buffer schrijven: %s\n" -#: lib/protocols.c:845 lib/protocols.c:868 lib/protocols.c:1700 -#: lib/protocols.c:1792 +#: lib/protocols.c:855 lib/protocols.c:878 lib/protocols.c:1711 +#: lib/protocols.c:1803 #, c-format msgid "Looking up %s\n" msgstr "%s opzoeken\n" -#: lib/protocols.c:851 lib/protocols.c:874 lib/protocols.c:1705 -#: lib/protocols.c:1797 +#: lib/protocols.c:861 lib/protocols.c:884 lib/protocols.c:1716 +#: lib/protocols.c:1808 #, c-format msgid "Cannot look up hostname %s: %s\n" msgstr "Kan de hostnaam %s niet vinden: %s\n" -#: lib/protocols.c:1189 lib/protocols.c:1191 lib/protocols.c:1222 -#: lib/protocols.c:1231 lib/protocols.c:1311 lib/protocols.c:1313 -#: lib/protocols.c:1350 +#: lib/protocols.c:1200 lib/protocols.c:1202 lib/protocols.c:1233 +#: lib/protocols.c:1242 lib/protocols.c:1322 lib/protocols.c:1324 +#: lib/protocols.c:1361 msgid "unknown" msgstr "onbekend" -#: lib/protocols.c:1720 lib/protocols.c:1762 lib/rfc959.c:656 +#: lib/protocols.c:1731 lib/protocols.c:1773 lib/rfc959.c:632 #, c-format msgid "Failed to create a socket: %s\n" msgstr "Mislukt om buis te maken: %s\n" -#: lib/protocols.c:1726 lib/protocols.c:1811 +#: lib/protocols.c:1737 lib/protocols.c:1822 #, c-format msgid "Trying %s:%d\n" msgstr "Probeer %s:%d\n" -#: lib/protocols.c:1731 lib/protocols.c:1818 +#: lib/protocols.c:1742 lib/protocols.c:1829 #, c-format msgid "Cannot connect to %s: %s\n" msgstr "Kan geen verbinding met %s maken: %s\n" -#: lib/protocols.c:1833 +#: lib/protocols.c:1852 #, c-format msgid "Connected to %s:%d\n" msgstr "Verbonden met %s:%d\n" -#: lib/rfc2068.c:127 lib/rfc2068.c:136 lib/rfc959.c:137 lib/rfc959.c:146 -#: lib/rfc959.c:752 lib/rfc959.c:790 lib/ssh.c:304 lib/ssh.c:313 -#: lib/sshv2.c:362 lib/sshv2.c:371 src/gtk/view_dialog.c:80 -#: src/gtk/view_dialog.c:150 -#, c-format -msgid "Cannot fdopen() socket: %s\n" -msgstr "Kan buis niet fdopen(): %s\n" - -#: lib/rfc2068.c:155 lib/rfc959.c:274 lib/ssh.c:374 lib/sshv2.c:426 +#: lib/rfc2068.c:137 lib/rfc959.c:267 lib/ssh.c:359 lib/sshv2.c:411 #, c-format msgid "Disconnecting from site %s\n" msgstr "Bezig met verbinding %s te verbreken\n" -#: lib/rfc2068.c:213 -#, fuzzy, c-format -msgid "Starting the file transfer at offset %lld\n" -msgstr "Bestandsoverdracht gestart vanaf offset %ld\n" - -#: lib/rfc2068.c:218 +#: lib/rfc2068.c:190 #, c-format msgid "Starting the file transfer at offset %ld\n" msgstr "Bestandsoverdracht gestart vanaf offset %ld\n" -#: lib/rfc2068.c:238 +#: lib/rfc2068.c:209 #, c-format msgid "Cannot retrieve file %s\n" msgstr "Kan bestand %s niet ontvangen\n" -#: lib/rfc2068.c:314 +#: lib/rfc2068.c:281 msgid "Finished retrieving data\n" msgstr "Gegevens zijn ontvangen\n" -#: lib/rfc2068.c:361 lib/ssh.c:582 lib/sshv2.c:853 +#: lib/rfc2068.c:329 lib/ssh.c:566 lib/sshv2.c:839 msgid "Retrieving directory listing...\n" msgstr "Directorylijst aan het ontvangen...\n" -#: lib/rfc959.c:570 lib/ssh.c:703 +#: lib/rfc959.c:130 lib/rfc959.c:139 lib/rfc959.c:728 lib/rfc959.c:766 +#: src/gtk/view_dialog.c:79 src/gtk/view_dialog.c:148 +#, c-format +msgid "Cannot fdopen() socket: %s\n" +msgstr "Kan buis niet fdopen(): %s\n" + +#: lib/rfc959.c:546 lib/ssh.c:687 msgid "total" msgstr "totaal" -#: lib/rfc959.c:572 lib/ssh.c:706 +#: lib/rfc959.c:548 lib/ssh.c:690 #, c-format msgid "Warning: Cannot parse listing %s\n" msgstr "Waarschuwing: Kan lijst %s niet ontleden\n" -#: lib/rfc959.c:700 +#: lib/rfc959.c:676 #, c-format msgid "Cannot create a data connection: %s\n" msgstr "Kan geen gegevensverbinding maken: %s\n" -#: lib/rfc959.c:715 +#: lib/rfc959.c:691 #, c-format msgid "Cannot bind a port: %s\n" msgstr "Kan niet binden aan poort: %s\n" -#: lib/rfc959.c:726 +#: lib/rfc959.c:702 #, c-format msgid "Cannot listen on port %d: %s\n" msgstr "Kan niet luisteren aan poort %d: %s\n" -#: lib/rfc959.c:779 +#: lib/rfc959.c:755 #, c-format msgid "Cannot accept connection from server: %s\n" msgstr "Kan geen verbinding met server accepteren: %s\n" -#: lib/rfc959.c:855 lib/rfc959.c:865 lib/ssh.c:1031 lib/ssh.c:1044 -#: lib/sshv2.c:530 lib/sshv2.c:540 +#: lib/rfc959.c:831 lib/rfc959.c:841 lib/ssh.c:1015 lib/ssh.c:1028 +#: lib/sshv2.c:515 lib/sshv2.c:525 #, c-format msgid "Error: Could not write to socket: %s\n" msgstr "Fout: Kan niet naar buis schrijven: %s\n" @@ -915,167 +907,167 @@ msgid "Error: Received wrong init string from server\n" msgstr "Fout: Ontving verkeerde initialisatieregel van server\n" -#: lib/ssh.c:328 lib/sshv2.c:393 +#: lib/ssh.c:313 lib/sshv2.c:378 #, c-format msgid "Successfully logged into SSH server %s\n" msgstr "Succesvol verbonden met SSH server %s\n" -#: lib/ssh.c:334 lib/sshv2.c:399 +#: lib/ssh.c:319 lib/sshv2.c:384 #, c-format msgid "Cannot fork another process: %s\n" msgstr "Kan geen ander proces splitsen: %s\n" -#: lib/ssh.c:412 +#: lib/ssh.c:397 #, c-format msgid "Remote host could not find file %s\n" msgstr "Externe host kan bestand %s niet vinden\n" -#: lib/ssh.c:527 lib/ssh.c:598 lib/ssh.c:721 +#: lib/ssh.c:510 lib/ssh.c:582 lib/ssh.c:705 msgid "Received unexpected response from server\n" msgstr "Ontving onverwacht antwoord van server\n" -#: lib/ssh.c:634 +#: lib/ssh.c:618 msgid "Finished retrieving directory listing\n" msgstr "Directorylijst ontvangen\n" -#: lib/ssh.c:752 +#: lib/ssh.c:736 #, c-format msgid "Could not change remote directory to %s: %s\n" msgstr "Kan niet naar externe map %s: %s\n" -#: lib/ssh.c:1068 lib/sshv2.c:581 lib/sshv2.c:884 lib/sshv2.c:1746 -#: lib/sshv2.c:1830 lib/sshv2.c:1914 +#: lib/ssh.c:1052 lib/sshv2.c:566 lib/sshv2.c:870 lib/sshv2.c:1741 +#: lib/sshv2.c:1825 lib/sshv2.c:1909 #, c-format msgid "Error: Message size %d too big from server\n" msgstr "Fout: Berichtgrootte %d van server te groot\n" -#: lib/ssh.c:1098 lib/sshv2.c:563 lib/sshv2.c:597 +#: lib/ssh.c:1082 lib/sshv2.c:548 lib/sshv2.c:582 #, c-format msgid "Error: Could not read from socket: %s\n" msgstr "Fout: Kan niet van buis lezen: %s\n" -#: lib/sshv2.c:385 lib/sshv2.c:446 lib/sshv2.c:459 lib/sshv2.c:481 -#: lib/sshv2.c:819 lib/sshv2.c:875 lib/sshv2.c:988 lib/sshv2.c:1001 -#: lib/sshv2.c:1014 lib/sshv2.c:1027 lib/sshv2.c:1083 lib/sshv2.c:1139 -#: lib/sshv2.c:1206 lib/sshv2.c:1644 lib/sshv2.c:1737 lib/sshv2.c:1821 -#: lib/sshv2.c:1902 lib/sshv2.c:1984 +#: lib/sshv2.c:370 lib/sshv2.c:431 lib/sshv2.c:444 lib/sshv2.c:466 +#: lib/sshv2.c:805 lib/sshv2.c:861 lib/sshv2.c:974 lib/sshv2.c:987 +#: lib/sshv2.c:1000 lib/sshv2.c:1013 lib/sshv2.c:1069 lib/sshv2.c:1126 +#: lib/sshv2.c:1194 lib/sshv2.c:1639 lib/sshv2.c:1732 lib/sshv2.c:1816 +#: lib/sshv2.c:1897 lib/sshv2.c:1979 msgid "Received wrong response from server, disconnecting\n" msgstr "Ontving verkeerd antwoord van server, verbinding wordt verbroken\n" -#: lib/sshv2.c:506 +#: lib/sshv2.c:491 #, c-format msgid "Error: Message size %d too big\n" msgstr "Fout: Berichtgrootte %d te groot\n" -#: lib/sshv2.c:642 +#: lib/sshv2.c:627 #, c-format msgid "%d: Protocol Initialization\n" msgstr "%d: Protocol Initialisatie\n" -#: lib/sshv2.c:648 +#: lib/sshv2.c:633 #, c-format msgid "%d: Protocol version %d\n" msgstr "%d: Protocol versie %d\n" -#: lib/sshv2.c:657 +#: lib/sshv2.c:642 #, c-format msgid "%d: Open %s\n" msgstr "%d: %s openen\n" -#: lib/sshv2.c:662 +#: lib/sshv2.c:647 #, c-format msgid "%d: Close\n" msgstr "%d: Sluiten\n" -#: lib/sshv2.c:668 +#: lib/sshv2.c:653 #, c-format msgid "%d: Open Directory %s\n" msgstr "%d: Directory %s openen\n" -#: lib/sshv2.c:673 +#: lib/sshv2.c:658 #, c-format msgid "%d: Read Directory\n" msgstr "%d: Directory Lezen\n" -#: lib/sshv2.c:677 +#: lib/sshv2.c:662 #, c-format msgid "%d: Remove file %s\n" msgstr "%d: Kan bestand %s niet verwijderen\n" -#: lib/sshv2.c:682 +#: lib/sshv2.c:667 #, c-format msgid "%d: Make directory %s\n" msgstr "%d: Maak Directory %s\n" -#: lib/sshv2.c:687 +#: lib/sshv2.c:672 #, c-format msgid "%d: Remove directory %s\n" msgstr "%d: Verwijder directory %s\n" -#: lib/sshv2.c:692 +#: lib/sshv2.c:677 #, c-format msgid "%d: Realpath %s\n" msgstr "%d: Echtpath %s\n" -#: lib/sshv2.c:697 +#: lib/sshv2.c:682 #, c-format msgid "%d: File attributes\n" msgstr "%d: Bestand attributen\n" -#: lib/sshv2.c:701 +#: lib/sshv2.c:686 #, c-format msgid "%d: Stat %s\n" msgstr "%d: Stat %s\n" -#: lib/sshv2.c:718 +#: lib/sshv2.c:703 #, c-format msgid "%d: Chmod %s %o\n" msgstr "%d: Chmod %s %o\n" -#: lib/sshv2.c:723 +#: lib/sshv2.c:708 #, c-format msgid "%d: Utime %s %d\n" msgstr "%d: Utime %s %d\n" -#: lib/sshv2.c:736 src/gtk/bookmarks.c:364 src/gtk/bookmarks.c:1081 -#: src/gtk/chmod_dialog.c:181 src/gtk/options_dialog.c:312 -#: src/gtk/options_dialog.c:686 src/gtk/transfer.c:1722 +#: lib/sshv2.c:721 src/gtk/bookmarks.c:333 src/gtk/bookmarks.c:996 +#: src/gtk/menu-items.c:317 src/gtk/options_dialog.c:273 +#: src/gtk/options_dialog.c:620 src/gtk/transfer.c:1747 msgid "OK" msgstr "OK" -#: lib/sshv2.c:739 +#: lib/sshv2.c:724 msgid "EOF" msgstr "EOF" -#: lib/sshv2.c:742 +#: lib/sshv2.c:727 msgid "No such file or directory" msgstr "Bestand of directory bestaat niet" -#: lib/sshv2.c:745 +#: lib/sshv2.c:730 msgid "Permission denied" msgstr "Toegang geweigerd" +#: lib/sshv2.c:733 +msgid "Failure" +msgstr "Mislukt" + +#: lib/sshv2.c:736 +msgid "Bad message" +msgstr "Slecht bericht" + +#: lib/sshv2.c:739 +msgid "No connection" +msgstr "Geen verbinding" + +#: lib/sshv2.c:742 +msgid "Connection lost" +msgstr "Verbinding verloren" + +#: lib/sshv2.c:745 +msgid "Operation unsupported" +msgstr "Operatie niet ondersteund" + #: lib/sshv2.c:748 -msgid "Failure" -msgstr "Mislukt" - -#: lib/sshv2.c:751 -msgid "Bad message" -msgstr "Slecht bericht" - -#: lib/sshv2.c:754 -msgid "No connection" -msgstr "Geen verbinding" - -#: lib/sshv2.c:757 -msgid "Connection lost" -msgstr "Verbinding verloren" - -#: lib/sshv2.c:760 -msgid "Operation unsupported" -msgstr "Operatie niet ondersteund" - -#: lib/sshv2.c:763 msgid "Unknown message returned from server" msgstr "Onbekend bericht ontavngen van server" @@ -1318,7 +1310,7 @@ "Het laatste nieuws over gFTP is te vinden op de website http://gftp.seul." "org/\n" -#: src/text/gftp-text.c:136 src/gtk/gftp-gtk.c:131 +#: src/gtk/gftp-gtk.c:128 src/text/gftp-text.c:136 msgid "" "gFTP comes with ABSOLUTELY NO WARRANTY; for details, see the COPYING file. " "This is free software, and you are welcome to redistribute it under certain " @@ -1336,19 +1328,19 @@ msgid "usage: open [[ftp://][user:pass@]ftp-site[:port][/directory]]\n" msgstr "gebruik: open [[ftp://][gebr:wachtw@]ftp-site[:poort][/directory]]\n" -#: src/text/gftp-text.c:319 src/gtk/dnd.c:43 src/gtk/menu-items.c:119 +#: src/gtk/dnd.c:43 src/gtk/menu-items.c:139 src/text/gftp-text.c:319 #, c-format msgid "Could not parse URL %s\n" msgstr "Kan URL %s niet ontleden\n" -#: src/text/gftp-text.c:367 src/gtk/menu-items.c:815 +#: src/gtk/menu-items.c:722 src/text/gftp-text.c:367 msgid "Translated by" msgstr "Vertaald door Myckel Habets <myckelhabets@netscape.net>" #: src/text/gftp-text.c:390 src/text/gftp-text.c:406 src/text/gftp-text.c:436 #: src/text/gftp-text.c:459 src/text/gftp-text.c:481 src/text/gftp-text.c:505 -#: src/text/gftp-text.c:533 src/text/gftp-text.c:564 src/text/gftp-text.c:615 -#: src/text/gftp-text.c:631 src/text/gftp-text.c:650 src/text/gftp-text.c:723 +#: src/text/gftp-text.c:533 src/text/gftp-text.c:564 src/text/gftp-text.c:610 +#: src/text/gftp-text.c:626 src/text/gftp-text.c:645 src/text/gftp-text.c:718 msgid "Error: Not connected to a remote site\n" msgstr "Fout: Niet verbonden met een externe site\n" @@ -1376,30 +1368,30 @@ msgid "usage: chmod <mode> <file>\n" msgstr "gebruik: chmod <modus> <bestand>\n" -#: src/text/gftp-text.c:656 +#: src/text/gftp-text.c:651 msgid "usage: mget <filespec>\n" msgstr "gebruik: mget <bestandspec>\n" -#: src/text/gftp-text.c:729 +#: src/text/gftp-text.c:724 msgid "usage: mput <filespec>\n" msgstr "gebruik: mput <bestandspec>\n" -#: src/text/gftp-text.c:813 src/gtk/transfer.c:592 +#: src/gtk/transfer.c:613 src/text/gftp-text.c:808 #, c-format msgid "File transfer will be throttled to %.2f KB/s\n" msgstr "Bestandsoverdracht zal worden afgeremd tot %.2f KB/s\n" -#: src/text/gftp-text.c:880 +#: src/text/gftp-text.c:875 #, c-format msgid "Could not download %s\n" msgstr "Kan %s niet downloaden\n" -#: src/text/gftp-text.c:887 +#: src/text/gftp-text.c:882 #, c-format msgid "Successfully transferred %s\n" msgstr "%s is succesvol overgedragen\n" -#: src/text/gftp-text.c:922 +#: src/text/gftp-text.c:917 msgid "" "Supported commands:\n" "\n" @@ -1407,21 +1399,21 @@ "Ondersteunde commando's:\n" "\n" -#: src/text/gftp-text.c:975 +#: src/text/gftp-text.c:970 msgid "usage: set [variable = value]\n" msgstr "gebruik: set [variabele = waarde]\n" -#: src/text/gftp-text.c:995 +#: src/text/gftp-text.c:990 #, c-format msgid "Error: Variable %s is not a valid configuration variable.\n" msgstr "Fout: Variabele %s is geen geldige configuratievariabele.\n" -#: src/text/gftp-text.c:1018 +#: src/text/gftp-text.c:1013 msgid "Error: You cannot change this variable\n" msgstr "Fout: U kan deze variabele niet veranderen\n" -#: src/gtk/bookmarks.c:72 src/gtk/gftp-gtk.c:951 src/gtk/menu-items.c:65 -#: src/gtk/menu-items.c:95 src/gtk/misc-gtk.c:461 src/gtk/misc-gtk.c:469 +#: src/gtk/bookmarks.c:72 src/gtk/gftp-gtk.c:963 src/gtk/menu-items.c:74 +#: src/gtk/menu-items.c:115 src/gtk/misc-gtk.c:461 src/gtk/misc-gtk.c:469 #, c-format msgid "%s: Please hit the stop button first to do anything else\n" msgstr "%s: De stopknop moet eerst aangeklikt worden, om iets anders te doen\n" @@ -1440,15 +1432,15 @@ "a.u.b. door aan masneyb@gftp.org. Vergeet niet het versie nummer en een " "korte beschrijving hoe de fout te reproduceren is mee te sturen\n" -#: src/gtk/bookmarks.c:139 src/gtk/bookmarks.c:150 +#: src/gtk/bookmarks.c:134 src/gtk/bookmarks.c:145 msgid "Add Bookmark" msgstr "Bladwijzer Toevoegen" -#: src/gtk/bookmarks.c:146 +#: src/gtk/bookmarks.c:141 msgid "Add Bookmark: You must enter a hostname\n" msgstr "Bladwijzer Toevoegen: Er moet een hostnaam ingevuld worden\n" -#: src/gtk/bookmarks.c:150 +#: src/gtk/bookmarks.c:145 msgid "" "Enter the name of the bookmark you want to add\n" "You can separate items by a / to put it into a submenu\n" @@ -1458,136 +1450,150 @@ "Met een / kunnen submenus aangegeven worden\n" "(bv: Linux/Debian)" -#: src/gtk/bookmarks.c:150 +#: src/gtk/bookmarks.c:145 msgid "Remember password" msgstr "Wachtwoord Onthouden" -#: src/gtk/bookmarks.c:166 +#: src/gtk/bookmarks.c:145 src/gtk/options_dialog.c:343 +msgid "Add" +msgstr "Toevoegen" + +#: src/gtk/bookmarks.c:145 src/gtk/bookmarks.c:343 src/gtk/bookmarks.c:721 +#: src/gtk/bookmarks.c:731 src/gtk/bookmarks.c:1008 src/gtk/chmod_dialog.c:162 +#: src/gtk/menu-items.c:101 src/gtk/menu-items.c:168 src/gtk/menu-items.c:317 +#: src/gtk/mkdir_dialog.c:42 src/gtk/options_dialog.c:284 +#: src/gtk/options_dialog.c:631 src/gtk/rename_dialog.c:53 +#: src/gtk/transfer.c:253 src/gtk/transfer.c:1112 src/gtk/transfer.c:1122 +#: src/gtk/transfer.c:1759 src/gtk/transfer.c:2010 +msgid " Cancel " +msgstr " Annuleer " + +#: src/gtk/bookmarks.c:161 msgid "Add Bookmark: You must enter a name for the bookmark\n" msgstr "" "Bladwijzer Toevoegen: Er moet een naam voor de bladwijzer ingevuld worden\n" -#: src/gtk/bookmarks.c:173 +#: src/gtk/bookmarks.c:168 #, c-format msgid "Add Bookmark: Cannot add bookmark %s because that name already exists\n" msgstr "" "Bladwijzer Toevoegen: Kan bladwijzer %s niet aanmaken omdat de naam al " "bestaat\n" -#: src/gtk/bookmarks.c:289 +#: src/gtk/bookmarks.c:226 src/gtk/bookmarks.c:243 +msgid "/Bookmarks/" +msgstr "/Bladwijzers/" + +#: src/gtk/bookmarks.c:276 msgid "/_File" msgstr "Bestand" -#: src/gtk/bookmarks.c:290 +#: src/gtk/bookmarks.c:277 msgid "/File/tearoff" msgstr "/Bestand/tearoff" -#: src/gtk/bookmarks.c:291 +#: src/gtk/bookmarks.c:278 msgid "/File/New Folder..." msgstr "/Bestand/Nieuwe Map..." -#: src/gtk/bookmarks.c:292 +#: src/gtk/bookmarks.c:279 msgid "/File/New Item..." msgstr "/Bestand/Nieuw Veld..." -#: src/gtk/bookmarks.c:293 +#: src/gtk/bookmarks.c:280 msgid "/File/Delete" msgstr "/Bestand/Verwijderen" -#: src/gtk/bookmarks.c:294 +#: src/gtk/bookmarks.c:281 msgid "/File/Properties..." msgstr "/Bestand/Instellingen..." -#: src/gtk/bookmarks.c:295 +#: src/gtk/bookmarks.c:282 msgid "/File/sep" msgstr "/Bestand/sep" -#: src/gtk/bookmarks.c:296 +#: src/gtk/bookmarks.c:283 msgid "/File/Close" msgstr "/Bestand/Sluiten" -#: src/gtk/bookmarks.c:307 src/gtk/bookmarks.c:310 +#: src/gtk/bookmarks.c:291 msgid "Edit Bookmarks" msgstr "Bladwijzers Bewerken" -#: src/gtk/bookmarks.c:325 src/gtk/bookmarks.c:899 src/gtk/chmod_dialog.c:87 -#: src/gtk/gftp-gtk.c:116 src/gtk/menu-items.c:797 src/gtk/misc-gtk.c:898 -#: src/gtk/misc-gtk.c:1019 src/gtk/options_dialog.c:102 -#: src/gtk/view_dialog.c:267 -msgid "gFTP Icon" -msgstr "gFTP Icon" - -#: src/gtk/bookmarks.c:374 src/gtk/bookmarks.c:1093 src/gtk/chmod_dialog.c:193 -#: src/gtk/options_dialog.c:323 src/gtk/options_dialog.c:697 -#: src/gtk/transfer.c:1734 -msgid " Cancel " -msgstr " Annuleer " - -#: src/gtk/bookmarks.c:765 src/gtk/bookmarks.c:775 +#: src/gtk/bookmarks.c:379 src/gtk/bookmarks.c:411 src/gtk/bookmarks.c:424 +#, c-format +msgid "/Bookmarks/%s" +msgstr "/Bladwijzers/%s" + +#: src/gtk/bookmarks.c:719 src/gtk/bookmarks.c:729 msgid "New Folder" msgstr "Nieuwe Map" -#: src/gtk/bookmarks.c:766 +#: src/gtk/bookmarks.c:720 msgid "Enter the name of the new folder to create" msgstr "Geef de naam van de aan te maken map" -#: src/gtk/bookmarks.c:776 +#: src/gtk/bookmarks.c:721 src/gtk/bookmarks.c:731 src/gtk/mkdir_dialog.c:41 +msgid "Create" +msgstr "Aanmaken" + +#: src/gtk/bookmarks.c:730 msgid "Enter the name of the new item to create" msgstr "Geef de naam van het aan te maken veld" -#: src/gtk/bookmarks.c:878 src/gtk/bookmarks.c:881 +#: src/gtk/bookmarks.c:812 msgid "Edit Entry" msgstr "Bewerk Ingang" -#: src/gtk/bookmarks.c:914 +#: src/gtk/bookmarks.c:830 msgid "Description:" msgstr "Beschrijving:" -#: src/gtk/bookmarks.c:929 +#: src/gtk/bookmarks.c:845 msgid "Hostname:" msgstr "Hostnaam:" -#: src/gtk/bookmarks.c:942 +#: src/gtk/bookmarks.c:858 msgid "Port:" msgstr "Poort:" -#: src/gtk/bookmarks.c:959 +#: src/gtk/bookmarks.c:875 msgid "Protocol:" msgstr "Protocol:" -#: src/gtk/bookmarks.c:983 +#: src/gtk/bookmarks.c:899 msgid "Remote Directory:" msgstr "Externe Directory:" -#: src/gtk/bookmarks.c:996 +#: src/gtk/bookmarks.c:912 msgid "Local Directory:" msgstr "Lokale Directory:" -#: src/gtk/bookmarks.c:1009 +#: src/gtk/bookmarks.c:925 msgid "Remote SSH sftp path:" msgstr "Externe SSH sftp path:" -#: src/gtk/bookmarks.c:1026 +#: src/gtk/bookmarks.c:942 msgid "Username:" msgstr "Gebruikersnaam:" -#: src/gtk/bookmarks.c:1039 +#: src/gtk/bookmarks.c:955 msgid "Password:" msgstr "Paswoord:" -#: src/gtk/bookmarks.c:1053 +#: src/gtk/bookmarks.c:969 msgid "Account:" msgstr "Account:" -#: src/gtk/bookmarks.c:1067 +#: src/gtk/bookmarks.c:983 msgid "Log in as ANONYMOUS" msgstr "Log in als ANONYMOUS" -#: src/gtk/bookmarks.c:1103 src/gtk/options_dialog.c:334 +#: src/gtk/bookmarks.c:1018 src/gtk/options_dialog.c:295 msgid "Apply" msgstr "Toepassen" -#: src/gtk/bookmarks.c:1143 +#: src/gtk/bookmarks.c:1056 #, c-format msgid "" "Are you sure you want to erase the bookmark\n" @@ -1596,20 +1602,27 @@ "Moeten bladwijzer %s en alle onderliggende\n" "bladwijzers verwijderd worden?" -#: src/gtk/bookmarks.c:1144 +#: src/gtk/bookmarks.c:1057 msgid "Delete Bookmark" msgstr "Verwijder Bladwijzer" -#: src/gtk/bookmarks.c:1355 +#: src/gtk/bookmarks.c:1057 src/gtk/delete_dialog.c:121 +msgid "Yes" +msgstr "Ja" + +#: src/gtk/bookmarks.c:1058 src/gtk/delete_dialog.c:122 +msgid "No" +msgstr "Nee" + +#: src/gtk/bookmarks.c:1270 msgid "Bookmarks" msgstr "Bladwijzers" -#: src/gtk/chmod_dialog.c:59 src/gtk/chmod_dialog.c:65 -#: src/gtk/chmod_dialog.c:70 +#: src/gtk/chmod_dialog.c:43 src/gtk/chmod_dialog.c:48 msgid "Chmod" msgstr "Chmod" -#: src/gtk/chmod_dialog.c:90 +#: src/gtk/chmod_dialog.c:60 msgid "" "You can now adjust the attributes of your file(s)\n" "Note: Not all ftp servers support the chmod feature" @@ -1617,66 +1630,70 @@ "De eigenschappen van de bestanden kunnen nu aangepast worden\n" "NB: Niet alle ftp servers ondersteunen de chmod optie" -#: src/gtk/chmod_dialog.c:100 +#: src/gtk/chmod_dialog.c:70 msgid "Special" msgstr "Speciaal" -#: src/gtk/chmod_dialog.c:108 +#: src/gtk/chmod_dialog.c:78 msgid "SUID" msgstr "SUID" -#: src/gtk/chmod_dialog.c:112 +#: src/gtk/chmod_dialog.c:82 msgid "SGID" msgstr "SGID" -#: src/gtk/chmod_dialog.c:116 +#: src/gtk/chmod_dialog.c:86 msgid "Sticky" msgstr "Plakkerig" -#: src/gtk/chmod_dialog.c:120 src/gtk/gftp-gtk.c:728 +#: src/gtk/chmod_dialog.c:90 src/gtk/gftp-gtk.c:740 msgid "User" msgstr "Gebruiker" -#: src/gtk/chmod_dialog.c:128 src/gtk/chmod_dialog.c:148 -#: src/gtk/chmod_dialog.c:168 +#: src/gtk/chmod_dialog.c:98 src/gtk/chmod_dialog.c:118 +#: src/gtk/chmod_dialog.c:138 msgid "Read" msgstr "Lezen" -#: src/gtk/chmod_dialog.c:132 src/gtk/chmod_dialog.c:152 -#: src/gtk/chmod_dialog.c:172 +#: src/gtk/chmod_dialog.c:102 src/gtk/chmod_dialog.c:122 +#: src/gtk/chmod_dialog.c:142 msgid "Write" msgstr "Schrijven" -#: src/gtk/chmod_dialog.c:136 src/gtk/chmod_dialog.c:156 -#: src/gtk/chmod_dialog.c:176 +#: src/gtk/chmod_dialog.c:106 src/gtk/chmod_dialog.c:126 +#: src/gtk/chmod_dialog.c:146 msgid "Execute" msgstr "Uitvoeren" -#: src/gtk/chmod_dialog.c:140 src/gtk/gftp-gtk.c:729 +#: src/gtk/chmod_dialog.c:110 src/gtk/gftp-gtk.c:741 msgid "Group" msgstr "Groep" -#: src/gtk/chmod_dialog.c:160 +#: src/gtk/chmod_dialog.c:130 msgid "Other" msgstr "Ander" -#: src/gtk/chmod_dialog.c:337 src/gtk/delete_dialog.c:230 -#: src/gtk/menu-items.c:576 src/gtk/mkdir_dialog.c:65 -#: src/gtk/rename_dialog.c:66 src/gtk/transfer.c:514 +#: src/gtk/chmod_dialog.c:150 src/gtk/menu-items.c:167 +msgid "Change" +msgstr "Verander" + +#: src/gtk/chmod_dialog.c:302 src/gtk/delete_dialog.c:242 +#: src/gtk/menu-items.c:496 src/gtk/mkdir_dialog.c:103 +#: src/gtk/rename_dialog.c:112 src/gtk/transfer.c:535 msgid "Operation canceled\n" msgstr "Operatie geannuleerd\n" -#: src/gtk/delete_dialog.c:45 src/gtk/options_dialog.c:400 +#: src/gtk/delete_dialog.c:46 src/gtk/options_dialog.c:357 msgid "Delete" msgstr "Verwijder" -#: src/gtk/delete_dialog.c:118 +#: src/gtk/delete_dialog.c:119 #, c-format msgid "Are you sure you want to delete these %ld files and %ld directories" msgstr "" "Weet u zeker dat u deze %ld bestanden en %ld directories wilt verwijderen?" -#: src/gtk/delete_dialog.c:120 +#: src/gtk/delete_dialog.c:121 msgid "Delete Files/Directories" msgstr "Verwijder Bestanden/Directories" @@ -1694,7 +1711,11 @@ msgid "Drag-N-Drop: Ignoring url %s: Not a valid url\n" msgstr "Klik en Sleep: URL %s overgeslagen: Geen geldig URL\n" -#: src/gtk/gftp-gtk.c:129 +#: src/gtk/gftp-gtk.c:113 +msgid "gFTP Icon" +msgstr "gFTP Icon" + +#: src/gtk/gftp-gtk.c:126 msgid "" ">. If you have any questions, comments, or suggestions about this program, " "please feel free to email them to me. You can always find out the latest " @@ -1704,11 +1725,11 @@ "Het laatste nieuws over gFTP is te vinden op de website http://gftp.seul." "org/\n" -#: src/gtk/gftp-gtk.c:153 +#: src/gtk/gftp-gtk.c:150 src/gtk/gftp-gtk.c:152 msgid "Exit" msgstr "Afsluiten" -#: src/gtk/gftp-gtk.c:153 +#: src/gtk/gftp-gtk.c:151 msgid "" "There are file transfers in progress.\n" "Are you sure you want to exit?" @@ -1716,431 +1737,429 @@ "Er zijn bestandsoverdrachten bezig.\n" "Weet u zeker dat u wilt afsluiten?" -#: src/gtk/gftp-gtk.c:253 src/gtk/gftp-gtk.c:726 src/gtk/transfer.c:1577 +#: src/gtk/gftp-gtk.c:152 +msgid "Don't Exit" +msgstr "Niet Afsluiten" + +#: src/gtk/gftp-gtk.c:241 src/gtk/gftp-gtk.c:738 src/gtk/transfer.c:1602 msgid "Filename" msgstr "Bestandsnaam" -#: src/gtk/gftp-gtk.c:254 +#: src/gtk/gftp-gtk.c:242 msgid "Progress" msgstr "Voortgang" -#: src/gtk/gftp-gtk.c:351 +#: src/gtk/gftp-gtk.c:339 msgid "/_FTP" msgstr "FTP" -#: src/gtk/gftp-gtk.c:352 +#: src/gtk/gftp-gtk.c:340 msgid "/FTP/tearoff" msgstr "/FTP/tearoff" -#: src/gtk/gftp-gtk.c:353 +#: src/gtk/gftp-gtk.c:341 src/gtk/gftp-gtk.c:342 msgid "/FTP/Window 1" msgstr "/FTP/Venster 1" -#: src/gtk/gftp-gtk.c:354 +#: src/gtk/gftp-gtk.c:342 msgid "/FTP/Window 2" msgstr "/FTP/Venster 2" -#: src/gtk/gftp-gtk.c:355 src/gtk/gftp-gtk.c:358 src/gtk/gftp-gtk.c:361 +#: src/gtk/gftp-gtk.c:343 src/gtk/gftp-gtk.c:346 src/gtk/gftp-gtk.c:348 msgid "/FTP/sep" msgstr "/FTP/sep" -#: src/gtk/gftp-gtk.c:356 +#: src/gtk/gftp-gtk.c:344 src/gtk/gftp-gtk.c:345 msgid "/FTP/Ascii" msgstr "/FTP/Ascii" -#: src/gtk/gftp-gtk.c:357 +#: src/gtk/gftp-gtk.c:345 msgid "/FTP/Binary" msgstr "/FTP/Binair" -#: src/gtk/gftp-gtk.c:359 +#: src/gtk/gftp-gtk.c:347 msgid "/FTP/_Options..." msgstr "/FTP/Opties..." -#: src/gtk/gftp-gtk.c:362 +#: src/gtk/gftp-gtk.c:349 msgid "/FTP/_Quit" msgstr "/FTP/Afsluiten" -#: src/gtk/gftp-gtk.c:363 +#: src/gtk/gftp-gtk.c:350 msgid "/_Local" msgstr "Lokaal" -#: src/gtk/gftp-gtk.c:364 +#: src/gtk/gftp-gtk.c:351 msgid "/Local/tearoff" msgstr "/Lokaal/tearoff" -#: src/gtk/gftp-gtk.c:365 +#: src/gtk/gftp-gtk.c:352 msgid "/Local/Open _URL..." msgstr "/Lokaal/Open URL..." -#: src/gtk/gftp-gtk.c:366 +#: src/gtk/gftp-gtk.c:353 msgid "/Local/Disconnect" msgstr "/Lokaal/Verbinding Verbreken" -#: src/gtk/gftp-gtk.c:367 src/gtk/gftp-gtk.c:373 +#: src/gtk/gftp-gtk.c:354 src/gtk/gftp-gtk.c:360 msgid "/Local/sep" msgstr "/Lokaal/sep" -#: src/gtk/gftp-gtk.c:368 +#: src/gtk/gftp-gtk.c:355 msgid "/Local/Change Filespec..." msgstr "/Lokaal/Verander Bestandsspec..." -#: src/gtk/gftp-gtk.c:369 +#: src/gtk/gftp-gtk.c:356 msgid "/Local/Show selected" msgstr "/Lokaal/Geselecteerde weergeven" -#: src/gtk/gftp-gtk.c:370 +#: src/gtk/gftp-gtk.c:357 msgid "/Local/Select All" msgstr "/Lokaal/Selecteer Alles" -#: src/gtk/gftp-gtk.c:371 +#: src/gtk/gftp-gtk.c:358 msgid "/Local/Select All Files" msgstr "/Lokaal/Selecteer Alle Bestanden" -#: src/gtk/gftp-gtk.c:372 +#: src/gtk/gftp-gtk.c:359 msgid "/Local/Deselect All" msgstr "/Lokaal/Deselecteer Alles" -#: src/gtk/gftp-gtk.c:374 -#, fuzzy -msgid "/Local/Save Directory Listing..." -msgstr "/Lokaal/Maak Directory..." - -#: src/gtk/gftp-gtk.c:375 +#: src/gtk/gftp-gtk.c:361 msgid "/Local/Send SITE Command..." msgstr "/Lokaal/Zend SITE Commando..." -#: src/gtk/gftp-gtk.c:376 +#: src/gtk/gftp-gtk.c:362 msgid "/Local/Change Directory" msgstr "/Lokaal/Verander Directory" -#: src/gtk/gftp-gtk.c:377 +#: src/gtk/gftp-gtk.c:363 msgid "/Local/Chmod..." msgstr "/Lokaal/Chmod" -#: src/gtk/gftp-gtk.c:378 +#: src/gtk/gftp-gtk.c:364 msgid "/Local/Make Directory..." msgstr "/Lokaal/Maak Directory..." -#: src/gtk/gftp-gtk.c:379 +#: src/gtk/gftp-gtk.c:365 msgid "/Local/Rename..." msgstr "/Lokaal/Hernoem..." -#: src/gtk/gftp-gtk.c:380 +#: src/gtk/gftp-gtk.c:366 msgid "/Local/Delete..." msgstr "/Lokaal/Verwijder..." -#: src/gtk/gftp-gtk.c:381 +#: src/gtk/gftp-gtk.c:367 msgid "/Local/Edit..." msgstr "/Lokaal/Bewerken..." -#: src/gtk/gftp-gtk.c:382 +#: src/gtk/gftp-gtk.c:368 msgid "/Local/View..." msgstr "/Lokaal/Weergave..." -#: src/gtk/gftp-gtk.c:383 +#: src/gtk/gftp-gtk.c:369 msgid "/Local/Refresh" msgstr "/Lokaal/Verversen" -#: src/gtk/gftp-gtk.c:384 +#: src/gtk/gftp-gtk.c:370 msgid "/_Remote" msgstr "/Extern" -#: src/gtk/gftp-gtk.c:385 +#: src/gtk/gftp-gtk.c:371 msgid "/Remote/tearoff" msgstr "/Extern/tearoff" -#: src/gtk/gftp-gtk.c:386 +#: src/gtk/gftp-gtk.c:372 msgid "/Remote/Open _URL..." msgstr "/Extern/Open URL..." -#: src/gtk/gftp-gtk.c:388 +#: src/gtk/gftp-gtk.c:373 msgid "/Remote/Disconnect" msgstr "/Extern/Verbinding Verbreken" -#: src/gtk/gftp-gtk.c:390 src/gtk/gftp-gtk.c:396 +#: src/gtk/gftp-gtk.c:374 src/gtk/gftp-gtk.c:380 msgid "/Remote/sep" msgstr "/Extern/sep" -#: src/gtk/gftp-gtk.c:391 +#: src/gtk/gftp-gtk.c:375 msgid "/Remote/Change Filespec..." msgstr "/Extern/Verander Bestandsspec..." -#: src/gtk/gftp-gtk.c:392 +#: src/gtk/gftp-gtk.c:376 msgid "/Remote/Show selected" msgstr "/Extern/Geselecteerde weergeven" -#: src/gtk/gftp-gtk.c:393 +#: src/gtk/gftp-gtk.c:377 msgid "/Remote/Select All" msgstr "/Extern/Selecteer Alles" -#: src/gtk/gftp-gtk.c:394 +#: src/gtk/gftp-gtk.c:378 msgid "/Remote/Select All Files" msgstr "/Extern/Selecteer Alle Bestanden" -#: src/gtk/gftp-gtk.c:395 +#: src/gtk/gftp-gtk.c:379 msgid "/Remote/Deselect All" msgstr "/Extern/Deselecteer Alles" -#: src/gtk/gftp-gtk.c:397 -#, fuzzy -msgid "/Remote/Save Directory Listing..." -msgstr "/Extern/Maak Directory..." - -#: src/gtk/gftp-gtk.c:398 +#: src/gtk/gftp-gtk.c:381 msgid "/Remote/Send SITE Command..." msgstr "/Extern/Zend SITE Commando..." -#: src/gtk/gftp-gtk.c:399 +#: src/gtk/gftp-gtk.c:382 msgid "/Remote/Change Directory" msgstr "/Extern/Verander Directory" -#: src/gtk/gftp-gtk.c:400 +#: src/gtk/gftp-gtk.c:383 msgid "/Remote/Chmod..." msgstr "/Extern/Chmod..." -#: src/gtk/gftp-gtk.c:401 +#: src/gtk/gftp-gtk.c:384 msgid "/Remote/Make Directory..." msgstr "/Extern/Maak Directory..." -#: src/gtk/gftp-gtk.c:402 +#: src/gtk/gftp-gtk.c:385 msgid "/Remote/Rename..." msgstr "/Extern/Hernoem..." -#: src/gtk/gftp-gtk.c:403 +#: src/gtk/gftp-gtk.c:386 msgid "/Remote/Delete..." msgstr "/Extern/Verwijder..." -#: src/gtk/gftp-gtk.c:404 +#: src/gtk/gftp-gtk.c:387 msgid "/Remote/Edit..." msgstr "/Extern/Bewerken..." -#: src/gtk/gftp-gtk.c:405 +#: src/gtk/gftp-gtk.c:388 msgid "/Remote/View..." msgstr "/Extern/Weergave..." -#: src/gtk/gftp-gtk.c:406 +#: src/gtk/gftp-gtk.c:389 msgid "/Remote/Refresh" msgstr "/Extern/Ververs" -#: src/gtk/gftp-gtk.c:407 +#: src/gtk/gftp-gtk.c:390 msgid "/_Bookmarks" msgstr "/Bladwijzers" -#: src/gtk/gftp-gtk.c:408 +#: src/gtk/gftp-gtk.c:391 msgid "/Bookmarks/tearoff" msgstr "/Bladwijzers/tearoff" -#: src/gtk/gftp-gtk.c:409 +#: src/gtk/gftp-gtk.c:392 msgid "/Bookmarks/Add bookmark" msgstr "/Bladwijzers/Bladwijzers Toevoegen" -#: src/gtk/gftp-gtk.c:411 +#: src/gtk/gftp-gtk.c:393 msgid "/Bookmarks/Edit bookmarks" msgstr "/Bladwijzers/Bladwijzers Bewerken" -#: src/gtk/gftp-gtk.c:412 +#: src/gtk/gftp-gtk.c:394 msgid "/Bookmarks/sep" msgstr "/Bladwijzers/sep" -#: src/gtk/gftp-gtk.c:413 +#: src/gtk/gftp-gtk.c:395 msgid "/_Transfers" msgstr "/Overdracht" -#: src/gtk/gftp-gtk.c:414 +#: src/gtk/gftp-gtk.c:396 msgid "/Transfers/tearoff" msgstr "/Overdracht/tearoff" -#: src/gtk/gftp-gtk.c:415 +#: src/gtk/gftp-gtk.c:397 msgid "/Transfers/Start Transfer" msgstr "/Overdracht/Start Overdracht" -#: src/gtk/gftp-gtk.c:416 +#: src/gtk/gftp-gtk.c:398 msgid "/Transfers/Stop Transfer" msgstr "/Overdracht/Stop Overdracht" -#: src/gtk/gftp-gtk.c:418 src/gtk/gftp-gtk.c:426 +#: src/gtk/gftp-gtk.c:399 src/gtk/gftp-gtk.c:404 msgid "/Transfers/sep" msgstr "/Overdracht/sep" -#: src/gtk/gftp-gtk.c:419 +#: src/gtk/gftp-gtk.c:400 msgid "/Transfers/Skip Current File" msgstr "/Overdracht/Huidig Bestand Overslaan" -#: src/gtk/gftp-gtk.c:420 +#: src/gtk/gftp-gtk.c:401 msgid "/Transfers/Remove File" msgstr "/Overdracht/Bestanden Verwijderen" -#: src/gtk/gftp-gtk.c:422 +#: src/gtk/gftp-gtk.c:402 msgid "/Transfers/Move File _Up" msgstr "/Overdracht/Verplaats Bestand Omhoog" -#: src/gtk/gftp-gtk.c:424 +#: src/gtk/gftp-gtk.c:403 msgid "/Transfers/Move File _Down" msgstr "/Overdracht/Verplaats Bestand Omlaag" -#: src/gtk/gftp-gtk.c:427 +#: src/gtk/gftp-gtk.c:405 msgid "/Transfers/Retrieve Files" msgstr "/Overdracht/Bestanden Ontvangen" -#: src/gtk/gftp-gtk.c:428 +#: src/gtk/gftp-gtk.c:406 msgid "/Transfers/Put Files" msgstr "/Overdracht/Bestanden Verzenden " -#: src/gtk/gftp-gtk.c:429 +#: src/gtk/gftp-gtk.c:407 msgid "/L_ogging" msgstr "/Loggen" -#: src/gtk/gftp-gtk.c:430 +#: src/gtk/gftp-gtk.c:408 msgid "/Logging/tearoff" msgstr "/Loggen/tearoff" -#: src/gtk/gftp-gtk.c:431 +#: src/gtk/gftp-gtk.c:409 msgid "/Logging/Clear" msgstr "/Loggen/Wissen" -#: src/gtk/gftp-gtk.c:432 +#: src/gtk/gftp-gtk.c:410 msgid "/Logging/View log..." msgstr "/Loggen/Bekijk log..." -#: src/gtk/gftp-gtk.c:433 +#: src/gtk/gftp-gtk.c:411 msgid "/Logging/Save log..." msgstr "/Loggen/Log oplaan..." -#: src/gtk/gftp-gtk.c:434 +#: src/gtk/gftp-gtk.c:412 msgid "/Tool_s" msgstr "/Toepassingen" -#: src/gtk/gftp-gtk.c:435 +#: src/gtk/gftp-gtk.c:413 msgid "/Tools/tearoff" msgstr "/Toepassingen/tearoff" -#: src/gtk/gftp-gtk.c:436 +#: src/gtk/gftp-gtk.c:414 msgid "/Tools/Compare Windows" msgstr "/Toepassingen/Vergelijk Vensters" -#: src/gtk/gftp-gtk.c:437 +#: src/gtk/gftp-gtk.c:415 msgid "/Tools/Clear Cache" msgstr "/Toepassingen/Buffer Leegmaken" -#: src/gtk/gftp-gtk.c:438 +#: src/gtk/gftp-gtk.c:416 msgid "/_Help" msgstr "/Help" -#: src/gtk/gftp-gtk.c:439 +#: src/gtk/gftp-gtk.c:417 msgid "/Help/tearoff" msgstr "/Help/tearoff" -#: src/gtk/gftp-gtk.c:440 +#: src/gtk/gftp-gtk.c:418 msgid "/Help/About..." msgstr "/Help/Info..." -#: src/gtk/gftp-gtk.c:551 +#: src/gtk/gftp-gtk.c:555 msgid "Host: " msgstr "Host: " -#: src/gtk/gftp-gtk.c:566 +#: src/gtk/gftp-gtk.c:570 msgid "Port: " msgstr "Poort: " -#: src/gtk/gftp-gtk.c:581 +#: src/gtk/gftp-gtk.c:585 msgid "User: " msgstr "Naam: " -#: src/gtk/gftp-gtk.c:596 +#: src/gtk/gftp-gtk.c:600 msgid "Pass: " -msgstr "Pawoord: " - -#: src/gtk/gftp-gtk.c:727 +msgstr "Paswoord: " + +#: src/gtk/gftp-gtk.c:739 msgid "Size" msgstr "Grootte" -#: src/gtk/gftp-gtk.c:730 +#: src/gtk/gftp-gtk.c:742 msgid "Date" msgstr "Datum" -#: src/gtk/gftp-gtk.c:731 +#: src/gtk/gftp-gtk.c:743 msgid "Attribs" msgstr "Rechten" -#: src/gtk/gftp-gtk.c:952 src/gtk/misc-gtk.c:871 src/gtk/misc-gtk.c:939 +#: src/gtk/gftp-gtk.c:964 src/gtk/menu-items.c:100 src/gtk/transfer.c:252 +#: src/gtk/transfer.c:1111 src/gtk/transfer.c:1121 msgid "Connect" msgstr "Verbinden" -#: src/gtk/gftp-gtk.c:971 +#: src/gtk/gftp-gtk.c:983 msgid "Error: You must type in a host to connect to\n" msgstr "Fout: Er is geen host gegeven om verbinding mee te maken\n" -#: src/gtk/menu-items.c:66 src/gtk/menu-items.c:96 +#: src/gtk/gftp-gtk.c:1042 +msgid "Sort" +msgstr "Sorteer" + +#: src/gtk/gftp-gtk.c:1045 +msgid "Sorting..." +msgstr "Aan het sorteren..." + +#: src/gtk/menu-items.c:75 src/gtk/menu-items.c:116 msgid "OpenURL" msgstr "OpenURL" -#: src/gtk/menu-items.c:74 src/gtk/menu-items.c:104 +#: src/gtk/menu-items.c:83 src/gtk/menu-items.c:124 msgid "OpenURL: Operation canceled...you must enter a string\n" msgstr "OpenURL: Operatie geannuleerd...er moet een string ingevoerd worden\n" -#: src/gtk/menu-items.c:128 +#: src/gtk/menu-items.c:99 msgid "Connect via URL" msgstr "Verbinden via URL" -#: src/gtk/menu-items.c:128 +#: src/gtk/menu-items.c:99 msgid "Enter ftp url to connect to" msgstr "Geef FTP URL om verbinding mee te maken" -#: src/gtk/menu-items.c:160 +#: src/gtk/menu-items.c:163 src/gtk/menu-items.c:166 +msgid "Change Filespec" +msgstr "Verander Bestandsspec" + +#: src/gtk/menu-items.c:166 +msgid "Enter the new file specification" +msgstr "Geef nieuwe bestandsspecificatie" + +#: src/gtk/menu-items.c:188 msgid "Change Filespec: Operation canceled...you must enter a string\n" msgstr "" "Verander Bestandspec: Operatie geannuleers...u moet een string invoeren\n" -#: src/gtk/menu-items.c:198 src/gtk/menu-items.c:201 -msgid "Change Filespec" -msgstr "Verander Bestandsspec" - -#: src/gtk/menu-items.c:201 -msgid "Enter the new file specification" -msgstr "Geef nieuwe bestandsspecificatie" - -#: src/gtk/menu-items.c:231 src/gtk/menu-items.c:636 src/gtk/menu-items.c:692 -#: src/gtk/view_dialog.c:70 src/gtk/view_dialog.c:140 -#, fuzzy, c-format -msgid "Error: Cannot open %s for writing: %s\n" -msgstr "gFTP Waarschuwing: Kan niet naar %s schrijven: %s\n" - -#: src/gtk/menu-items.c:281 -#, fuzzy -msgid "Save Directory Listing" -msgstr "Directorylijst aan het ophalen" - -#: src/gtk/menu-items.c:398 +#: src/gtk/menu-items.c:313 src/gtk/menu-items.c:316 +msgid "Site" +msgstr "Site" + +#: src/gtk/menu-items.c:316 +msgid "Enter site-specific command" +msgstr "Geef site-specifiek commando" + +#: src/gtk/menu-items.c:332 msgid "SITE: Operation canceled...you must enter a string\n" msgstr "SITE: Operatie afgebroken...u moet een string invoeren\n" -#: src/gtk/menu-items.c:417 src/gtk/menu-items.c:420 -msgid "Site" -msgstr "Site" - -#: src/gtk/menu-items.c:420 -msgid "Enter site-specific command" -msgstr "Geef site-specifiek commando" - -#: src/gtk/menu-items.c:440 src/gtk/menu-items.c:474 +#: src/gtk/menu-items.c:360 src/gtk/menu-items.c:394 msgid "Chdir" msgstr "Chdir" -#: src/gtk/menu-items.c:659 src/gtk/menu-items.c:715 +#: src/gtk/menu-items.c:555 src/gtk/menu-items.c:630 src/gtk/view_dialog.c:69 +#: src/gtk/view_dialog.c:138 +#, c-format +msgid "Error: Cannot open %s: %s\n" +msgstr "Fout: Kan %s niet openen: %s\n" + +#: src/gtk/menu-items.c:578 src/gtk/menu-items.c:653 #, c-format msgid "Error: Error writing to %s: %s\n" msgstr "Fout: Fout bij schrijven naar %s: %s\n" -#: src/gtk/menu-items.c:725 +#: src/gtk/menu-items.c:598 +msgid "Save Log" +msgstr "Log Opslaan" + +#: src/gtk/menu-items.c:663 #, c-format msgid "Successfully wrote the log file to %s\n" msgstr "Log bestand succesvol naar %s geschreven\n" -#: src/gtk/menu-items.c:737 -msgid "Save Log" -msgstr "Log Opslaan" - -#: src/gtk/menu-items.c:773 +#: src/gtk/menu-items.c:691 #, c-format msgid "" "Cannot find the license agreement file COPYING. Please make sure it is in " @@ -2149,11 +2168,11 @@ "Kan het licentiebestand COPYING niet vinden. Controleer of dit bestand " "aanwezig is in %s of in %s" -#: src/gtk/menu-items.c:777 src/gtk/menu-items.c:782 +#: src/gtk/menu-items.c:694 msgid "About gFTP" msgstr "Info over gFTP" -#: src/gtk/menu-items.c:813 +#: src/gtk/menu-items.c:720 #, c-format msgid "" "%s\n" @@ -2166,35 +2185,35 @@ "Officiele Webpagina: http://www.gftp.org/\n" "Logo door: Aaron Worley <planet_hoth@yahoo.com>\n" -#: src/gtk/menu-items.c:826 +#: src/gtk/menu-items.c:733 msgid "About" msgstr "Info" -#: src/gtk/menu-items.c:875 +#: src/gtk/menu-items.c:782 msgid "License Agreement" msgstr "Licentie Overeenkomst" -#: src/gtk/menu-items.c:881 src/gtk/view_dialog.c:314 +#: src/gtk/menu-items.c:787 src/gtk/view_dialog.c:299 msgid " Close " msgstr " Sluiten " -#: src/gtk/menu-items.c:963 +#: src/gtk/menu-items.c:864 msgid "Compare Windows" msgstr "Vergelijk Vensters" -#: src/gtk/misc-gtk.c:190 +#: src/gtk/misc-gtk.c:191 msgid "Refresh" msgstr "Ververs" -#: src/gtk/misc-gtk.c:257 +#: src/gtk/misc-gtk.c:258 msgid "All Files" msgstr "Alle Bestanden" -#: src/gtk/misc-gtk.c:263 +#: src/gtk/misc-gtk.c:264 msgid "] (Cached) [" msgstr "] (Gebufferd) [" -#: src/gtk/misc-gtk.c:277 +#: src/gtk/misc-gtk.c:278 msgid "Not connected" msgstr "Niet verbonden" @@ -2223,43 +2242,15 @@ msgid "%s: You must have at least one item selected\n" msgstr "%s: Er moet minstens een onderdeel geselecteerd zijn\n" -#: src/gtk/misc-gtk.c:868 src/gtk/misc-gtk.c:936 -msgid "Change" -msgstr "Verander" - -#: src/gtk/misc-gtk.c:874 src/gtk/misc-gtk.c:942 src/gtk/rename_dialog.c:109 -#: src/gtk/rename_dialog.c:121 -msgid "Rename" -msgstr "Hernoem" - -#: src/gtk/misc-gtk.c:933 src/gtk/options_dialog.c:386 -msgid "Add" -msgstr "Toevoegen" - -#: src/gtk/misc-gtk.c:959 -#, fuzzy -msgid "Cancel" -msgstr " Annuleer " - -#: src/gtk/misc-gtk.c:1029 -#, fuzzy -msgid " Yes " -msgstr " Sluiten " - -#: src/gtk/misc-gtk.c:1039 -#, fuzzy -msgid " No " -msgstr " Stop " - -#: src/gtk/misc-gtk.c:1079 +#: src/gtk/misc-gtk.c:937 msgid "Getting directory listings" msgstr "Directorylijst aan het ophalen" -#: src/gtk/misc-gtk.c:1099 +#: src/gtk/misc-gtk.c:957 msgid " Stop " msgstr " Stop " -#: src/gtk/misc-gtk.c:1109 +#: src/gtk/misc-gtk.c:967 #, c-format msgid "" "Received %ld directories\n" @@ -2268,182 +2259,187 @@ "%ld directories en\n" "%ld bestanden ontvangen" -#: src/gtk/mkdir_dialog.c:87 -msgid "Mkdir: Operation canceled...you must enter a string\n" -msgstr "Mkdir: Operatie geannuleerd...u moet een string invoeren\n" - -#: src/gtk/mkdir_dialog.c:108 +#: src/gtk/mkdir_dialog.c:36 msgid "Mkdir" msgstr "Mkdir" -#: src/gtk/mkdir_dialog.c:112 +#: src/gtk/mkdir_dialog.c:40 msgid "Make Directory" msgstr "Maak Directory" -#: src/gtk/mkdir_dialog.c:112 +#: src/gtk/mkdir_dialog.c:40 msgid "Enter name of directory to create" msgstr "Geef de naam van de aan te maken directory" -#: src/gtk/options_dialog.c:77 src/gtk/options_dialog.c:83 +#: src/gtk/mkdir_dialog.c:56 +msgid "Mkdir: Operation canceled...you must enter a string\n" +msgstr "Mkdir: Operatie geannuleerd...u moet een string invoeren\n" + +#: src/gtk/options_dialog.c:57 msgid "Options" msgstr "Opties" -#: src/gtk/options_dialog.c:360 src/gtk/options_dialog.c:582 +#: src/gtk/options_dialog.c:317 src/gtk/options_dialog.c:517 msgid "Netmask" msgstr "Netmask" -#: src/gtk/options_dialog.c:366 +#: src/gtk/options_dialog.c:323 msgid "Local Hosts" msgstr "Lokale Hosts" -#: src/gtk/options_dialog.c:393 src/gtk/view_dialog.c:105 +#: src/gtk/options_dialog.c:350 src/gtk/view_dialog.c:104 msgid "Edit" msgstr "Bewerken" -#: src/gtk/options_dialog.c:497 +#: src/gtk/options_dialog.c:440 msgid "Edit Host" msgstr "Host Bewerken" -#: src/gtk/options_dialog.c:497 +#: src/gtk/options_dialog.c:440 msgid "Add Host" msgstr "Host Toevoegen" -#: src/gtk/options_dialog.c:529 src/gtk/options_dialog.c:620 +#: src/gtk/options_dialog.c:464 src/gtk/options_dialog.c:555 msgid "Domain" msgstr "Domein" -#: src/gtk/options_dialog.c:549 +#: src/gtk/options_dialog.c:484 msgid "Network Address" msgstr "Netwerk Adres" -#: src/gtk/rename_dialog.c:88 -msgid "Rename: Operation canceled...you must enter a string\n" -msgstr "Hernoem: Operatie geannuleerd...u moet een string invoeren\n" - -#: src/gtk/rename_dialog.c:119 +#: src/gtk/rename_dialog.c:40 src/gtk/rename_dialog.c:52 +#: src/gtk/rename_dialog.c:53 +msgid "Rename" +msgstr "Hernoem" + +#: src/gtk/rename_dialog.c:50 #, c-format msgid "What would you like to rename %s to?" msgstr "Wat moet de nieuwe naam van %s worden?" -#: src/gtk/transfer.c:72 +#: src/gtk/rename_dialog.c:68 +msgid "Rename: Operation canceled...you must enter a string\n" +msgstr "Hernoem: Operatie geannuleerd...u moet een string invoeren\n" + +#: src/gtk/transfer.c:80 msgid "Receiving file names..." msgstr "Bestandsnamen aan het ontvangen..." -#: src/gtk/transfer.c:241 src/gtk/transfer.c:1220 +#: src/gtk/transfer.c:234 src/gtk/transfer.c:1211 msgid "Connecting..." msgstr "Verbinding maken..." -#: src/gtk/transfer.c:251 src/gtk/transfer.c:1116 src/gtk/transfer.c:1127 +#: src/gtk/transfer.c:250 src/gtk/transfer.c:1109 src/gtk/transfer.c:1119 msgid "Enter Password" msgstr "Geef Paswoord" -#: src/gtk/transfer.c:252 src/gtk/transfer.c:1117 src/gtk/transfer.c:1128 +#: src/gtk/transfer.c:251 src/gtk/transfer.c:1110 src/gtk/transfer.c:1120 msgid "Please enter your password for this site" msgstr "Geef uw paswoord voor deze site" -#: src/gtk/transfer.c:343 +#: src/gtk/transfer.c:364 #, c-format msgid "Waiting %d seconds until trying to connect again\n" msgstr "Wacht %d seconden om opnieuw te proberen verbinden\n" -#: src/gtk/transfer.c:388 +#: src/gtk/transfer.c:409 msgid "Transfer Files" msgstr "Bestanden Overdragen" -#: src/gtk/transfer.c:396 +#: src/gtk/transfer.c:417 msgid "Retrieve Files: Not connected to a remote site\n" msgstr "Bestanden Ontvangen: Er is geen verbinding met een externe site\n" -#: src/gtk/transfer.c:639 +#: src/gtk/transfer.c:660 msgid "Error: Remote site disconnected after trying to transfer file\n" msgstr "" "Fout: Externe site verbrak de verbinding na poging om bestandsoverdracht te " "starten\n" -#: src/gtk/transfer.c:700 +#: src/gtk/transfer.c:721 #, c-format msgid "Could not download %s from %s\n" msgstr "Kan %s niet van %s downloaden\n" -#: src/gtk/transfer.c:735 +#: src/gtk/transfer.c:756 #, c-format msgid "Successfully transferred %s at %.2f KB/s\n" msgstr "%s is succesvol overgedragen met %.2f KB/s\n" -#: src/gtk/transfer.c:838 src/gtk/transfer.c:1018 src/gtk/transfer.c:1096 -#: src/gtk/transfer.c:1433 +#: src/gtk/transfer.c:859 src/gtk/transfer.c:1039 src/gtk/transfer.c:1089 +#: src/gtk/transfer.c:1458 msgid "Skipped" msgstr "Overgeslagen" -#: src/gtk/transfer.c:842 src/gtk/transfer.c:1073 src/gtk/transfer.c:1100 +#: src/gtk/transfer.c:863 src/gtk/transfer.c:1066 src/gtk/transfer.c:1093 msgid "Waiting..." msgstr "Wachten..." -#: src/gtk/transfer.c:927 +#: src/gtk/transfer.c:948 #, c-format msgid "Retrieving file names...%s bytes" msgstr "Bestandsnamen ontvangen...%s bytes" -#: src/gtk/transfer.c:1021 +#: src/gtk/transfer.c:1042 msgid "Finished" msgstr "Klaar" -#: src/gtk/transfer.c:1053 +#: src/gtk/transfer.c:1251 #, c-format -msgid "Stopping the transfer of %s\n" -msgstr "Stop de overdracht van %s\n" - -#: src/gtk/transfer.c:1260 -#, fuzzy, c-format -msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %ld of %ld)" -msgstr "%d%% compleet, %02d:%02d:%02d benodigde tijd. (Bestand %d van %d)" - -#: src/gtk/transfer.c:1285 +msgid "%d%% complete, %02d:%02d:%02d est. time remaining. (File %d of %ld)" +msgstr "%d%% compleet, %02d:%02d:%02d benodigde tijd. (Bestand %d van %ld)" + +#: src/gtk/transfer.c:1276 #, c-format msgid "Recv %s of %s at %.2fKB/s, %02d:%02d:%02d est. time remaining" msgstr "Ontv %s van %s met %.2fKB/s %02d:%02d:%02d benodigde tijd" -#: src/gtk/transfer.c:1294 +#: src/gtk/transfer.c:1285 #, c-format msgid "Recv %s of %s, transfer stalled, unknown time remaining" msgstr "Ontv %s van %s, overdracht gestremd, onbekende tijd nodig" -#: src/gtk/transfer.c:1317 src/gtk/transfer.c:1339 src/gtk/transfer.c:1369 -#: src/gtk/transfer.c:1403 src/gtk/transfer.c:1454 src/gtk/transfer.c:1514 +#: src/gtk/transfer.c:1327 +#, c-format +msgid "Stopping the transfer of %s\n" +msgstr "Stop de overdracht van %s\n" + +#: src/gtk/transfer.c:1342 src/gtk/transfer.c:1364 src/gtk/transfer.c:1394 +#: src/gtk/transfer.c:1428 src/gtk/transfer.c:1479 src/gtk/transfer.c:1539 msgid "There are no file transfers selected\n" msgstr "Er zijn geen bestandsoverdrachten geselecteerd\n" -#: src/gtk/transfer.c:1353 +#: src/gtk/transfer.c:1378 #, c-format msgid "Stopping the transfer on host %s\n" msgstr "Stop de overdracht op host %s\n" -#: src/gtk/transfer.c:1386 src/gtk/transfer.c:1437 +#: src/gtk/transfer.c:1411 src/gtk/transfer.c:1462 #, c-format msgid "Skipping file %s on host %s\n" msgstr "Bestand %s overgeslagen op host %s\n" -#: src/gtk/transfer.c:1578 +#: src/gtk/transfer.c:1603 msgid "Local Size" msgstr "Lokale Grootte" -#: src/gtk/transfer.c:1579 +#: src/gtk/transfer.c:1604 msgid "Remote Size" msgstr "Externe Grootte" -#: src/gtk/transfer.c:1580 +#: src/gtk/transfer.c:1605 msgid "Action" msgstr "Actie" -#: src/gtk/transfer.c:1585 +#: src/gtk/transfer.c:1610 msgid "Download Files" msgstr "Bestanden Downloaden" -#: src/gtk/transfer.c:1585 +#: src/gtk/transfer.c:1610 msgid "Upload Files" msgstr "Bestanden Uploaden" -#: src/gtk/transfer.c:1598 +#: src/gtk/transfer.c:1623 msgid "" "The following file(s) exist on both the local and remote computer\n" "Please select what you would like to do" @@ -2451,70 +2447,74 @@ "De volgende bestanden bestaan zowel op de lokale als de externe computer\n" "Selecteer wat er moet gebeuren" -#: src/gtk/transfer.c:1649 src/gtk/transfer.c:1688 src/gtk/transfer.c:1787 +#: src/gtk/transfer.c:1674 src/gtk/transfer.c:1713 src/gtk/transfer.c:1812 msgid "Overwrite" msgstr "Overschrijven" -#: src/gtk/transfer.c:1654 src/gtk/transfer.c:1831 +#: src/gtk/transfer.c:1679 src/gtk/transfer.c:1856 msgid "Skip" msgstr "Overslaan" -#: src/gtk/transfer.c:1659 src/gtk/transfer.c:1694 src/gtk/transfer.c:1809 +#: src/gtk/transfer.c:1684 src/gtk/transfer.c:1719 src/gtk/transfer.c:1834 msgid "Resume" msgstr "Hervatten" -#: src/gtk/transfer.c:1700 +#: src/gtk/transfer.c:1725 msgid "Skip File" msgstr "Bestand Overslaan" -#: src/gtk/transfer.c:1710 +#: src/gtk/transfer.c:1735 msgid "Select All" msgstr "Alles Selecteren" -#: src/gtk/transfer.c:1716 +#: src/gtk/transfer.c:1741 msgid "Deselect All" msgstr "Alles Deselecteren" -#: src/gtk/transfer.c:1957 +#: src/gtk/transfer.c:1982 #, c-format msgid "Error: Child %d returned %d\n" msgstr "Fout: Subproces %d geeft %d\n" -#: src/gtk/transfer.c:1960 +#: src/gtk/transfer.c:1985 #, c-format msgid "Child %d returned successfully\n" msgstr "Subproces %d is succesvol\n" -#: src/gtk/transfer.c:1967 +#: src/gtk/transfer.c:1992 #, c-format msgid "Error: Cannot get information about file %s: %s\n" msgstr "Fout: Kan geen informatie over bestand %s vinden: %s\n" -#: src/gtk/transfer.c:1972 +#: src/gtk/transfer.c:1997 #, c-format msgid "File %s was not changed\n" msgstr "Bestand %s is niet veranderd\n" -#: src/gtk/transfer.c:1980 -#, fuzzy, c-format +#: src/gtk/transfer.c:2005 +#, c-format msgid "" "File %s has changed.\n" -"Would you like to upload it?" +"What would you like to do?" msgstr "" "Bestand %s is veranderd.\n" "Wat moet er gebeuren?" -#: src/gtk/transfer.c:1983 +#: src/gtk/transfer.c:2008 msgid "Edit File" msgstr "Bewerk Bestand" -#: src/gtk/transfer.c:2065 +#: src/gtk/transfer.c:2009 +msgid "Upload" +msgstr "Uploaden" + +#: src/gtk/transfer.c:2095 #, c-format msgid "Error: Remote site %s disconnected. Max retries reached...giving up\n" msgstr "" "Fout: Kan niet verbinden met %s. Max herverbindingen bereikt...opgegeven\n" -#: src/gtk/transfer.c:2073 +#: src/gtk/transfer.c:2103 #, c-format msgid "Error: Remote site %s disconnected. Will reconnect in %d seconds\n" msgstr "" @@ -2529,70 +2529,40 @@ msgid "View: %s is a directory. Cannot view it.\n" msgstr "Weergave: %s is een directory. Kan niet weergeven.\n" -#: src/gtk/view_dialog.c:111 +#: src/gtk/view_dialog.c:110 msgid "Edit: You must specify an editor in the options dialog\n" msgstr "Bewerken: Er moet een editor in de opties aangegeven zijn\n" -#: src/gtk/view_dialog.c:124 +#: src/gtk/view_dialog.c:123 #, c-format msgid "Edit: %s is a directory. Cannot edit it.\n" msgstr "Bewerken: %s is een directory. Kan niet bewerken.\n" -#: src/gtk/view_dialog.c:192 +#: src/gtk/view_dialog.c:190 #, c-format msgid "Opening %s with %s\n" msgstr "Open %s met %s\n" -#: src/gtk/view_dialog.c:216 +#: src/gtk/view_dialog.c:214 #, c-format msgid "Viewing file %s\n" msgstr "Weergave bestand %s\n" -#: src/gtk/view_dialog.c:223 +#: src/gtk/view_dialog.c:221 #, c-format msgid "View: Cannot open file %s: %s\n" msgstr "Weergave: Kan bestand %s niet openen: %s\n" -#: src/gtk/view_dialog.c:392 +#: src/gtk/view_dialog.c:372 #, c-format msgid "View: Cannot fork another process: %s\n" msgstr "Weergave: Kan geen ander proces splitsen: %s\n" -#: src/gtk/view_dialog.c:395 +#: src/gtk/view_dialog.c:375 #, c-format msgid "Running program: %s %s\n" msgstr "Start programma: %s %s\n" -#~ msgid "/Bookmarks/" -#~ msgstr "/Bladwijzers/" - -#~ msgid "/Bookmarks/%s" -#~ msgstr "/Bladwijzers/%s" - -#~ msgid "Create" -#~ msgstr "Aanmaken" - -#~ msgid "Yes" -#~ msgstr "Ja" - -#~ msgid "No" -#~ msgstr "Nee" - -#~ msgid "Don't Exit" -#~ msgstr "Niet Afsluiten" - -#~ msgid "Sort" -#~ msgstr "Sorteer" - -#~ msgid "Sorting..." -#~ msgstr "Aan het sorteren..." - -#~ msgid "Error: Cannot open %s: %s\n" -#~ msgstr "Fout: Kan %s niet openen: %s\n" - -#~ msgid "Upload" -#~ msgstr "Uploaden" - #~ msgid "Log file:" #~ msgstr "Log bestand:"
--- a/po/no.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/no.po Mon Oct 07 10:40:43 2002 +0000 @@ -2,11 +2,10 @@ # Copyright (C) 2001 Free Software Foundation, Inc. # Anders Henriksen <anders@henrix.no>, 2001. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: gFTP 2.0.9\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2001-01-09 21:05+0100\n" "Last-Translator: Anders Henriksen <anders@henrix.no>\n" "Language-Team: Norwegian\n" @@ -507,7 +506,7 @@ msgid "The color of the rest of the log messages" msgstr "Fargen på resten av loggmeldingene" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP-feil: Feil i konfigurasjonsfilnavn: %s\n" @@ -526,7 +525,7 @@ msgid "Did you do a make install?\n" msgstr "Kjørte du \"make install\"?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP-feil: Kunne ikke åpne konfigurasjonsfil %s: %s\n" @@ -546,7 +545,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "gFTP-advarsel: Kan ikke åpne %s for skriving: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP-feil: Feil i bokmerkefilnavn: %s\n" @@ -556,7 +555,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "gFTP-feil: Kunne ikke finne hovedfilen for bokmerker %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP-feil: Kunne ikke åpne bokmerkefil %s: %s\n" @@ -566,7 +565,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP-advarsel: Hopper over linje %d i bokmerkefil %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 #, fuzzy msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -578,17 +577,7 @@ "filen SKRIVES OVER. Om en post har en \"*\" i kommentaren sin kan du endre " "den fra gFTP" -#: lib/config_file.c:777 -#, fuzzy -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"Konfigurationsfil for gFTP. Copyright (C) 1998-2002 Brian Masney " -"<masneyb@gftp.org>. Advarsel: Eventuelle kommentarer du legger til i denne " -"fila KOMMER TIL Å BLI OVERSKREVET." - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -599,7 +588,7 @@ "Format: dont_use_proxy=.domene eller dont_use_proxy=nettverksadress/" "nettverksmaske" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -607,11 +596,21 @@ "ext=filetternavn:XPM file:Ascii eller Binær (A eller B):visningsprogram. " "Merk: Alle argumenter bortsett fra filetternavnet er valgfrie" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "Denne seksjonen inneholder historiedata" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +#, fuzzy +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"Konfigurationsfil for gFTP. Copyright (C) 1998-2002 Brian Masney " +"<masneyb@gftp.org>. Advarsel: Eventuelle kommentarer du legger til i denne " +"fila KOMMER TIL Å BLI OVERSKREVET." + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP-advarsel: Linje %d har ikke mange nok argumenter\n" @@ -2219,8 +2218,8 @@ msgstr "Ikke oppkoblet" #: src/gtk/misc-gtk.c:387 -#, c-format -msgid "Error opening file %s\n" +#, fuzzy, c-format +msgid "Error opening file %s: %s\n" msgstr "gFTP-feil: Feil ved åpning av fil %s\n" #: src/gtk/misc-gtk.c:477
--- a/po/pl.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/pl.po Mon Oct 07 10:40:43 2002 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gFTP 2.0.12\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2000-07-16 13:12+0100\n" "Last-Translator: Przemys³aw Su³ek <pbs@linux.net.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -507,7 +507,7 @@ msgid "The color of the rest of the log messages" msgstr "Kolor pozosta³ych wiadomo¶ci w logu" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "B³±d gFTP: Niepoprawna nazwa pliku konfiguracyjnego %s\n" @@ -526,7 +526,7 @@ msgid "Did you do a make install?\n" msgstr "Czy zosta³o wykonane make install?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "B³±d gFTP: Nie mo¿na otworzyæ pliku konfiguracyjnego %s: %s\n" @@ -546,7 +546,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "Ostrze¿enie: nie mo¿na otworzyæ %s do zapisu: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "B³±d gFTP: Niepoprawna nazwa pliku zak³adek %s\n" @@ -556,7 +556,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "B³±d gFTP: Nie mo¿na odnale¼æ g³ównego pliku zak³adek %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "B³±d gFTP: Nie mo¿na otworzyæ pliku zak³adek %s: %s\n" @@ -566,7 +566,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "Ostrze¿enie gFTP: Pominiêto wiersz %d w pliku zak³adek: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -577,16 +577,7 @@ "nadpisane Je¶li wpis zawiera (*) w komentarzu, nie mo¿na go zmieniæ wewn±trz " "gFTP" -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"Plik zak³adek programu gFTP. Copyright (C) 1998-2002 Brian Masney " -"<masneyb@gftp.org> Uwaga: Wszystkie komentarze dodane do tego pliku zostan± " -"nadpisane." - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -597,7 +588,7 @@ "jest dostêpny). Sk³adnia: dont_use_proxy=.domena lub dont_use_proxy=adres " "sieciowy/maska" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -606,11 +597,20 @@ "przegl±darki Uwaga: Wszystkie argumenty poza rozszerzeniem pliku s± " "opcjonalne" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "W tej sekcji znajduj± siê dane dotycz±ce historii" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"Plik zak³adek programu gFTP. Copyright (C) 1998-2002 Brian Masney " +"<masneyb@gftp.org> Uwaga: Wszystkie komentarze dodane do tego pliku zostan± " +"nadpisane." + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr ""
--- a/po/pt_BR.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/pt_BR.po Mon Oct 07 10:40:43 2002 +0000 @@ -2,11 +2,10 @@ # Copyright (C) 2000 Free Software Foundation, Inc. # Isaías V. Prestes <isix@uol.com.br>, 2000. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: gFTP 2.0.7\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2000-07-10 13:35-0300\n" "Last-Translator: Isaías V. Prestes <isix@uol.com.br>\n" "Language-Team: pt_BR <pt_BR@li.org>\n" @@ -487,7 +486,7 @@ msgid "The color of the rest of the log messages" msgstr "" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP Erro: Configurações erradas em %s\n" @@ -506,7 +505,7 @@ msgid "Did you do a make install?\n" msgstr "Você fez um make install?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP Erro: Impossível abrir arquivo de configuração %s: %s\n" @@ -526,7 +525,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "gFTP Erro: Impossível abrir arquivo Favoritos %s: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP Erro: Erro no arquivo de Favoritos %s\n" @@ -536,7 +535,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "Atenção: Impossível encontrar arquivo de Favoritos %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP Erro: Impossível abrir arquivo Favoritos %s: %s\n" @@ -546,7 +545,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP Atenção: Ignorando linha %d no arquivo de Favoritos: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 #, fuzzy msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -558,7 +557,24 @@ "# Atenção: Qualquer comentário adicionado neste arquivo será sobrescrito\n" "\n" +#: lib/config_file.c:776 +msgid "" +"This section specifies which hosts are on the local subnet and won't need to " +"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " +"dont_use_proxy=network number/netmask" +msgstr "" + #: lib/config_file.c:777 +msgid "" +"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " +"All arguments except the file extension are optional" +msgstr "" + +#: lib/config_file.c:778 +msgid "This section contains the data that is in the history" +msgstr "" + +#: lib/config_file.c:900 #, fuzzy msgid "" "Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -569,24 +585,7 @@ "# Atenção: Qualquer comentário adicionado neste arquivo será sobrescrito\n" "\n" -#: lib/config_file.c:778 -msgid "" -"This section specifies which hosts are on the local subnet and won't need to " -"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " -"dont_use_proxy=network number/netmask" -msgstr "" - -#: lib/config_file.c:779 -msgid "" -"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " -"All arguments except the file extension are optional" -msgstr "" - -#: lib/config_file.c:780 -msgid "This section contains the data that is in the history" -msgstr "" - -#: lib/config_file.c:1005 +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP Atenção: Linha %d não contém argumentos suficientes\n"
--- a/po/ro.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/ro.po Mon Oct 07 10:40:43 2002 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp-2.0.13\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2002-09-10 18:44+0300\n" "Last-Translator: Mugurel Tudor <mugurelu@go.ro>\n" "Language-Team: românã <ro@li.org>\n" @@ -519,7 +519,7 @@ msgid "The color of the rest of the log messages" msgstr "Culoarea restului de mesaje de logare" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "Eroare gFTP: Nume greºit pentru fiºierul de configurare %s\n" @@ -538,7 +538,7 @@ msgid "Did you do a make install?\n" msgstr "Aþi fãcut un make install ?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "Eroare gFTP: Nu am putut deschide fiºierul de configurare %s: %s\n" @@ -558,7 +558,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "Avertisment gFTP: Nu am putut deschide %s pentru scriere: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "Eroare gFTP: Nume greºit pentru fiºierul cu semne de carte %s\n" @@ -569,7 +569,7 @@ msgstr "" "Avertisment: Nu am putut gãsi fiºierul principal cu semne de carte %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "Eroare gFTP: Nu am putut deschide fiºierul cu semne de carte %s: %s\n" @@ -579,7 +579,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "Avertisment gFTP: Ignor linia %d din fiºierul semnelor de carte: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -590,16 +590,7 @@ "SUPRASCRISE. Dacã o intrare are un (*) în comentariul sãu, nu o puteþi " "schimba din interiorul gFTP" -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"Fiºier pentru semnele de carte gFTP. Copyright (C) 1998-2002 Brian Masney " -"<masneyb@gftp.org>. Avertisment: orice comentarii adãugate acestui fiºier " -"VOR FI suprascrise" - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -609,7 +600,7 @@ "nevoie sã iasã prin serverul proxy (dacã e disponibil). Sintaxa: " "dont_use_proxy=.domeniu sau dont_use_proxy=numãr reþea/mascã reþea" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -617,11 +608,20 @@ "ext=extensie fiºier:fiºier XPM:Ascii sau Binar (A sau B):program " "vizualizare. Toate argumentele în afara extensiei fiºierului sunt opþionale." -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "Aceastã secþiune conþine date care sunt în istoric" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"Fiºier pentru semnele de carte gFTP. Copyright (C) 1998-2002 Brian Masney " +"<masneyb@gftp.org>. Avertisment: orice comentarii adãugate acestui fiºier " +"VOR FI suprascrise" + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "Avertisment gFTP: Linia %d nu are destule argumente\n"
--- a/po/ru.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/ru.po Mon Oct 07 10:40:43 2002 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp-2.0.13\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2002-09-08 01:25MSK\n" "Last-Translator: Vitaly Lipatov <lav@altlinux.ru>\n" "Language-Team: Russian <gnome-cyr@gnome.org>\n" @@ -513,7 +513,7 @@ msgid "The color of the rest of the log messages" msgstr "ã×ÅÔ ×ÓÅÈ ÐÒÏÞÉÈ ÓÏÏÂÝÅÎÉÊ × ÖÕÒÎÁÌÅ" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "ïÛÉÂËÁ gFTP: îÅ×ÅÒÎÏÅ ÎÁÚ×ÁÎÉÅ ÆÁÊÌÁ ÎÁÓÔÒÏÅË %s\n" @@ -532,7 +532,7 @@ msgid "Did you do a make install?\n" msgstr "÷Ù ×ÙÐÏÌÎÑÌÉ ÕÓÔÁÎÏ×ËÕ?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "ïÛÉÂËÁ gFTP: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÎÁÓÔÒÏÅË %s: %s\n" @@ -552,7 +552,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ gFTP: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÚÁÐÉÓÉ: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "ïÛÉÂËÁ gFTP: îÅÐÒÁ×ÉÌØÎÏÅ ÎÁÚ×ÁÎÉÅ ÆÁÊÌÁ ÚÁËÌÁÄÏË %s\n" @@ -562,7 +562,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "÷ÎÉÍÁÎÉÅ: îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÇÌÁ×ÎÙÊ ÆÁÊÌ ÚÁËÌÁÄÏË %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "ïÛÉÂËÁ gFTP: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÚÁËÌÁÄÏË %s: %s\n" @@ -572,7 +572,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ gFTP: ðÒÏÐÕÝÅÎÁ ÓÔÒÏËÁ %d × ÆÁÊÌÅ ÚÁËÌÁÄÏË: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " @@ -583,16 +583,7 @@ "ÜÔÏÍÕ ÆÁÊÌÕ, âõäõô ÐÅÒÅÚÁÐÉÓÁÎÙ. åÓÌÉ ÚÁÐÉÓØ ÓÏÄÅÒÖÉÔ (*) × ËÏÍÍÅÎÔÁÒÉÉ, ×Ù " "ÎÅ ÉÍÅÅÔÅ ×ÏÚÍÏÖÎÏÓÔÉ ÉÚÍÅÎÉÔØ Å£ ÓÏÄÅÒÖÉÍÏÅ ÞÅÒÅÚ gFTP" -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" -"æÁÊÌ ÚÁËÌÁÄÏË ÄÌÑ gFTP. á×ÔÏÒÓËÏÅ ÐÒÁ×Ï (C) 1998-2002 Brian Masney " -"<masneyb@seul.org>. ÷ÎÉÍÁÎÉÅ!: ìÀÂÙÅ ËÏÍÍÅÎÔÁÒÉÉ, ËÏÔÏÒÙÅ ×Ù ÄÏÂÁ×ÉÔÅ Ë " -"ÜÔÏÍÕ ÆÁÊÌÕ, âõäõô ÐÅÒÅÚÁÐÉÓÁÎÙ" - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -602,7 +593,7 @@ "ÐÒÏËÓÉ-ÓÅÒ×ÅÒÏÍ (ÅÓÌÉ ÏÎ ÄÏÓÔÕÐÅÎ). óÉÎÔÁËÓÉÓ: dont_use_proxy=.domain ÉÌÉ " "dont_use_proxy=network number/netmask" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -610,11 +601,20 @@ "ext=ÒÁÓÛÉÒÅÎÉÅ ÆÁÊÌÁ:XPM ÆÁÊÌ:Ascii ÉÌÉ ä×ÏÉÞÎÏÅ (A ÉÌÉ B):ÐÒÏÇÒÁÍÍÁ " "ÐÒÏÓÍÏÔÒÁ. úÁÍÅÔØÔÅ: ×ÓÅ ÁÒÇÕÍÅÎÔÙ ËÒÏÍÅ ÒÁÓÛÉÒÅÎÉÑ ÆÁÊÌÁ ÎÅ ÏÂÑÚÁÔÅÌØÎÙ" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "üÔÏ ÒÁÚÄÅÌ ÓÏÄÅÒÖÉÔ ÄÁÎÎÙÅ ÉÓÔÏÒÉÉ" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" +"æÁÊÌ ÚÁËÌÁÄÏË ÄÌÑ gFTP. á×ÔÏÒÓËÏÅ ÐÒÁ×Ï (C) 1998-2002 Brian Masney " +"<masneyb@seul.org>. ÷ÎÉÍÁÎÉÅ!: ìÀÂÙÅ ËÏÍÍÅÎÔÁÒÉÉ, ËÏÔÏÒÙÅ ×Ù ÄÏÂÁ×ÉÔÅ Ë " +"ÜÔÏÍÕ ÆÁÊÌÕ, âõäõô ÐÅÒÅÚÁÐÉÓÁÎÙ" + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr ""
--- a/po/sv.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/sv.po Mon Oct 07 10:40:43 2002 +0000 @@ -2,11 +2,10 @@ # Copyright (C) 1999 Free Software Foundation, Inc. # Anders Eurenius <c96aes@cs.umu.se>, 1999. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: gFTP 2.0.5a\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 1999-10-01 16:20+0200\n" "Last-Translator: Anders Eurenius <c96aes@cs.umu.se>\n" "Language-Team: Swedish\n" @@ -520,7 +519,7 @@ msgid "The color of the rest of the log messages" msgstr "" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP fel: Fel på namn på konfigurationsfil: %s\n" @@ -539,7 +538,7 @@ msgid "Did you do a make install?\n" msgstr "Körde du \"make install\"?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP fel: Kunde inte öppna konfigurationsfil %s: %s\n" @@ -559,7 +558,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "Varning: Kan inte tolka listning %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, fuzzy, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP fel: Fel på namn på bokmärkesfil: %s\n" @@ -569,7 +568,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "gFTP fel: Kunde inte hitta huvudfilen för bokmärken %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, fuzzy, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP fel: Kunde inte öppna bokmärkesfil %s: %s\n" @@ -579,7 +578,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP Varning: Hoppar över rad %d i konfigurationsfil %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 #, fuzzy msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -592,7 +591,29 @@ "# Om en post har ett (*) i sin kommentar, kan du ändra det inifrån gFTP.\n" "\n" +#: lib/config_file.c:776 +msgid "" +"This section specifies which hosts are on the local subnet and won't need to " +"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " +"dont_use_proxy=network number/netmask" +msgstr "" +"Denna sektion specifierar vilka värdar som ligger på det lokala subnätet, " +"och inte behöver kopplas genom någon proxy. (Om nödvändigt annars) Format: " +"dont_use_proxy= .domän eller dont_use_proxy= nätverks- adress/mask" + #: lib/config_file.c:777 +msgid "" +"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " +"All arguments except the file extension are optional" +msgstr "" +"ext=filnamnsändelse:XPM (bild) fil:Ascii eller Binär (A eller B):" +"Läsarprogram. Notera: Alla argument utom filnamnsändelsen är frivilliga" + +#: lib/config_file.c:778 +msgid "This section contains the data that is in the history" +msgstr "Denna sektion innehåller datat i historielistan" + +#: lib/config_file.c:900 #, fuzzy msgid "" "Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -604,29 +625,7 @@ "# KOMMER ATT SKRIVAS ÖVER.\n" "\n" -#: lib/config_file.c:778 -msgid "" -"This section specifies which hosts are on the local subnet and won't need to " -"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " -"dont_use_proxy=network number/netmask" -msgstr "" -"Denna sektion specifierar vilka värdar som ligger på det lokala subnätet, " -"och inte behöver kopplas genom någon proxy. (Om nödvändigt annars) Format: " -"dont_use_proxy= .domän eller dont_use_proxy= nätverks- adress/mask" - -#: lib/config_file.c:779 -msgid "" -"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " -"All arguments except the file extension are optional" -msgstr "" -"ext=filnamnsändelse:XPM (bild) fil:Ascii eller Binär (A eller B):" -"Läsarprogram. Notera: Alla argument utom filnamnsändelsen är frivilliga" - -#: lib/config_file.c:780 -msgid "This section contains the data that is in the history" -msgstr "Denna sektion innehåller datat i historielistan" - -#: lib/config_file.c:1005 +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP Varning: Rad %d har inte tillräckligt många argument\n"
--- a/po/tr.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/tr.po Mon Oct 07 10:40:43 2002 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gftp\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: 2000-03-09 15:20-0500\n" "Last-Translator: Görkem Çetin <gorkem@gelecek.com.tr>\n" "Language-Team: Turkish <gnome-turk@gnome.org>\n" @@ -487,7 +487,7 @@ msgid "The color of the rest of the log messages" msgstr "Kalan kayýt mesajlarýnýn renkleri" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP Hatasý: Hatalý yapýlandýrma dosyasý %s\n" @@ -506,7 +506,7 @@ msgid "Did you do a make install?\n" msgstr "Bir kurulum yaptýnýz mý?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP Hatasý: Yapýlandýrma dosyasý açýlamadý %s: %s\n" @@ -526,7 +526,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "gFTP Uyarýsý: %s dosyasý yazmak için açýlamadý: %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP Hatasý: %s dosyasýnda hatalý yer imleri\n" @@ -536,7 +536,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "Uyarý: Ana yer imi dosyasý bulunamadý: %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP Hatasý: Yer imi dosyasý %s açýlamadý: %s\n" @@ -546,7 +546,7 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP Uyarýsý: Yer imi dosyasýnda %d satýr atlanýyor: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 #, fuzzy msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -558,7 +558,24 @@ "silinecektir. Eðer bir bir satýr içinde (*) varsa, bunu gFTP içinden " "deðiþtiremezsiniz." +#: lib/config_file.c:776 +msgid "" +"This section specifies which hosts are on the local subnet and won't need to " +"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " +"dont_use_proxy=network number/netmask" +msgstr "" + #: lib/config_file.c:777 +msgid "" +"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " +"All arguments except the file extension are optional" +msgstr "" + +#: lib/config_file.c:778 +msgid "This section contains the data that is in the history" +msgstr "Bu bölüm tarihçede bulunan verileri kapsar." + +#: lib/config_file.c:900 #, fuzzy msgid "" "Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." @@ -567,24 +584,7 @@ "gFTP için yer imi dosyasý. (C) 1998-2002 Brian Masney <masneyb@gftp.org> " "Uyarý: Bu dosyaya ekleyeceðiniz açýklama satýrlarý silinecektir. " -#: lib/config_file.c:778 -msgid "" -"This section specifies which hosts are on the local subnet and won't need to " -"go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " -"dont_use_proxy=network number/netmask" -msgstr "" - -#: lib/config_file.c:779 -msgid "" -"ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " -"All arguments except the file extension are optional" -msgstr "" - -#: lib/config_file.c:780 -msgid "This section contains the data that is in the history" -msgstr "Bu bölüm tarihçede bulunan verileri kapsar." - -#: lib/config_file.c:1005 +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP Uyarýsý: %d satýrý yeterli argümana sahip deðil\n"
--- a/po/zh_CN.po Thu Oct 03 12:06:18 2002 +0000 +++ b/po/zh_CN.po Mon Oct 07 10:40:43 2002 +0000 @@ -2,11 +2,10 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: gftp-2.0.13\n" -"POT-Creation-Date: 2002-09-18 08:26-0400\n" +"POT-Creation-Date: 2002-09-26 15:25-0400\n" "PO-Revision-Date: ????-??-?? ??:??+??\n" "Last-Translator: ??? <??@???.??>\n" "Language-Team: ??\n" @@ -489,7 +488,7 @@ msgid "The color of the rest of the log messages" msgstr "" -#: lib/config_file.c:241 lib/config_file.c:784 +#: lib/config_file.c:241 lib/config_file.c:782 #, c-format msgid "gFTP Error: Bad config file name %s\n" msgstr "gFTP ´íÎó: ²»ÕýÈ·µÄÅäÖÃÎļþÃû %s\n" @@ -508,7 +507,7 @@ msgid "Did you do a make install?\n" msgstr "ÊÇ·ñ½øÐÐ make °²×°¹ý³Ì?\n" -#: lib/config_file.c:273 lib/config_file.c:789 +#: lib/config_file.c:273 lib/config_file.c:788 #, c-format msgid "gFTP Error: Cannot open config file %s: %s\n" msgstr "gFTP ´íÎó: ²»ÄÜ´ò¿ªÅäÖÃÎļþ %s: %s\n" @@ -528,7 +527,7 @@ msgid "gFTP Warning: Cannot open %s for writing: %s\n" msgstr "¾¯¸æ: ²»ÄܽâÎöÁбí %s\n" -#: lib/config_file.c:542 lib/config_file.c:800 +#: lib/config_file.c:542 lib/config_file.c:904 #, c-format msgid "gFTP Error: Bad bookmarks file name %s\n" msgstr "gFTP ´íÎó: ²»ÕýÈ·µÄÊéÇ©ÎļþÃû %s\n" @@ -538,7 +537,7 @@ msgid "Warning: Cannot find master bookmark file %s\n" msgstr "¾¯¸æ: ²»ÄÜÕÒµ½Ö÷ÊéÇ©Îļþ %s\n" -#: lib/config_file.c:574 lib/config_file.c:805 +#: lib/config_file.c:574 lib/config_file.c:910 #, c-format msgid "gFTP Error: Cannot open bookmarks file %s: %s\n" msgstr "gFTP ´íÎó: ²»ÄÜ´ò¿ªÊéÇ©Îļþ %s: %s\n" @@ -548,20 +547,14 @@ msgid "gFTP Warning: Skipping line %d in bookmarks file: %s\n" msgstr "gFTP ¾¯¸æ: Ìø¹ýÊéÇ©ÎļþµÚ %d ÐÐ: %s\n" -#: lib/config_file.c:776 +#: lib/config_file.c:775 msgid "" "Config file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." "org>. Warning: Any comments that you add to this file WILL be overwritten. " "If a entry has a (*) in it's comment, you can't change it inside gFTP" msgstr "" -#: lib/config_file.c:777 -msgid "" -"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." -"org>. Warning: Any comments that you add to this file WILL be overwritten" -msgstr "" - -#: lib/config_file.c:778 +#: lib/config_file.c:776 msgid "" "This section specifies which hosts are on the local subnet and won't need to " "go out the proxy server (if available). Syntax: dont_use_proxy=.domain or " @@ -570,7 +563,7 @@ "É趨±¾µØ×ÓÍøÖеÄÄÄЩÖ÷»úÎÞÐèʹÓôúÀí·þÎñÆ÷(µ±Ê¹Óà Proxy ʱ).Óï·¨: " "dont_use_proxy=.domain »ò dont_use_proxy=network number/netmask" -#: lib/config_file.c:779 +#: lib/config_file.c:777 msgid "" "ext=file extenstion:XPM file:Ascii or Binary (A or B):viewer program. Note: " "All arguments except the file extension are optional" @@ -578,11 +571,17 @@ "ext=ÎļþÀ©Õ¹Ãû:XPM file:Ascii »ò Binary (A »ò B):²é¿´³ÌÐò.×¢Òâ: ËùÓеIJÎÊý³ý" "ÁËÎļþÀ©Õ¹Ãû¶¼ÊÇ¿ÉÑ¡µÄ" -#: lib/config_file.c:780 +#: lib/config_file.c:778 msgid "This section contains the data that is in the history" msgstr "±¾¶Î°üº¬ÀúÊ·Êý¾Ý" -#: lib/config_file.c:1005 +#: lib/config_file.c:900 +msgid "" +"Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney <masneyb@gftp." +"org>. Warning: Any comments that you add to this file WILL be overwritten" +msgstr "" + +#: lib/config_file.c:1019 #, c-format msgid "gFTP Warning: Line %d doesn't have enough arguments\n" msgstr "gFTP ¾¯¸æ: µÚ %d ÐвÎÊý²»×ã\n"
--- a/src/gtk/Makefile.am Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/Makefile.am Mon Oct 07 10:40:43 2002 +0000 @@ -6,6 +6,6 @@ gftp-gtk.c menu-items.c misc-gtk.c mkdir_dialog.c \ options_dialog.c rename_dialog.c transfer.c view_dialog.c INCLUDES = @GTK_CFLAGS@ @PTHREAD_CFLAGS@ -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(localedir)\" -I../../intl -LDADD = ../../lib/libgftp.a @LIBINTL@ @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ +LDADD = ../../lib/libgftp.a @LIBINTL@ @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ @GTHREAD_LIBS@ noinst_HEADERS = gftp-gtk.h localedir = $(datadir)/locale
--- a/src/gtk/bookmarks.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/bookmarks.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-gtk.h" +static const char cvsid[] = "$Id$"; static void doadd_bookmark ( gpointer * data, gftp_dialog_data * ddata);
--- a/src/gtk/chmod_dialog.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/chmod_dialog.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-gtk.h" +static const char cvsid[] = "$Id$"; static void dochmod ( GtkWidget * widget, gftp_window_data * wdata );
--- a/src/gtk/delete_dialog.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/delete_dialog.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-gtk.h" +static const char cvsid[] = "$Id$"; static void askdel ( gftp_transfer * transfer ); static void yesCB ( gftp_transfer * transfer, @@ -82,9 +83,8 @@ timeout_num = gtk_timeout_add (100, progress_timeout, transfer); while (transfer->fromreq->stopable) { - gdk_threads_leave (); + GDK_THREADS_LEAVE (); g_main_iteration (TRUE); - gdk_threads_enter (); } gtk_widget_set_sensitive (stop_btn, 0); @@ -151,9 +151,8 @@ while (transfer->fromreq->stopable) { - gdk_threads_leave (); + GDK_THREADS_LEAVE (); g_main_iteration (TRUE); - gdk_threads_enter (); } gtk_widget_set_sensitive (stop_btn, 0);
--- a/src/gtk/dnd.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/dnd.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-gtk.h" +static const char cvsid[] = "$Id$"; static int dnd_remote_file ( char *url, GList ** transfers,
--- a/src/gtk/gftp-gtk.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/gftp-gtk.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-gtk.h" +static const char cvsid[] = "$Id$"; static gint delete_event ( GtkWidget * widget, GdkEvent * event, @@ -72,6 +73,7 @@ pthread_mutex_t transfer_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t log_mutex = PTHREAD_MUTEX_INITIALIZER; gftp_graphic * gftp_icon; +int gftp_is_started = 0; int main (int argc, char **argv) @@ -138,10 +140,11 @@ gftp_set_directory (window1.request, startup_directory); gftp_connect (window1.request); ftp_list_files (&window1, 0); + gftp_is_started = 1; - gdk_threads_enter (); + GDK_THREADS_ENTER (); gtk_main (); - gdk_threads_leave (); + GDK_THREADS_LEAVE (); return (0); }
--- a/src/gtk/gftp-gtk.h Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/gftp-gtk.h Mon Oct 07 10:40:43 2002 +0000 @@ -17,6 +17,8 @@ /* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /*****************************************************************************/ +/* $Id$ */ + #ifndef __GFTP_GTK_H #define __GFTP_GTK_H @@ -146,6 +148,7 @@ extern GtkItemFactory * factory; extern pthread_mutex_t transfer_mutex, log_mutex; extern gftp_graphic * gftp_icon; +extern int gftp_is_started; /* bookmarks.c */ void run_bookmark ( gpointer data );
--- a/src/gtk/menu-items.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/menu-items.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include <gftp-gtk.h> +static const char cvsid[] = "$Id$"; static int do_change_dir ( gftp_window_data * wdata, char * directory );
--- a/src/gtk/misc-gtk.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/misc-gtk.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include <gftp-gtk.h> +static const char cvsid[] = "$Id$"; static void set_menu_sensitive ( gftp_window_data * wdata, char *path, @@ -36,12 +37,14 @@ { int ret; + if (!gftp_is_started) + return; + ret = 1; while (ret) { - gdk_threads_leave (); + GDK_THREADS_LEAVE (); ret = g_main_iteration (FALSE); - gdk_threads_enter (); } } @@ -187,7 +190,7 @@ } #endif - if (ptr == NULL) + if (ptr == NULL) fix_display (); } @@ -1133,9 +1136,8 @@ while (wdata->request->stopable) { - gdk_threads_leave (); + GDK_THREADS_LEAVE (); g_main_iteration (TRUE); - gdk_threads_enter (); } pthread_join (wdata->tid, &ret);
--- a/src/gtk/mkdir_dialog.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/mkdir_dialog.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-gtk.h" +static const char cvsid[] = "$Id$"; static const char *edttext; static sigjmp_buf mkdirenvir;
--- a/src/gtk/options_dialog.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/options_dialog.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include <gftp-gtk.h> +static const char cvsid[] = "$Id$"; static void make_proxy_hosts_tab ( GtkWidget * notebook ); static void add_host_to_listbox ( GList * templist );
--- a/src/gtk/rename_dialog.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/rename_dialog.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-gtk.h" +static const char cvsid[] = "$Id$"; static sigjmp_buf renenvir; static const char *edttext;
--- a/src/gtk/transfer.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/transfer.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include <gftp-gtk.h> +static const char cvsid[] = "$Id$"; static void *getdir_thread ( void *data ); static void *connect_thread ( void *data ); @@ -70,7 +71,9 @@ void *success; gtk_label_set (GTK_LABEL (wdata->hoststxt), _("Receiving file names...")); - fix_display (); + if (gftp_is_started) + fix_display (); + wdata->show_selected = 0; if (wdata->files == NULL) { @@ -87,9 +90,8 @@ pthread_create (&wdata->tid, NULL, getdir_thread, wdata->request); while (wdata->request->stopable) { - gdk_threads_leave (); + GDK_THREADS_LEAVE (); g_main_iteration (TRUE); - gdk_threads_enter (); } teardown_wakeup_main_thread (wdata->request, handler); @@ -260,9 +262,8 @@ while (request->stopable) { - gdk_threads_leave (); + GDK_THREADS_LEAVE (); g_main_iteration (TRUE); - gdk_threads_enter (); } if (GFTP_GET_PASSWORD (request) == NULL || @@ -284,9 +285,8 @@ handler = setup_wakeup_main_thread (wdata->request); while (request->stopable) { - gdk_threads_leave (); + GDK_THREADS_LEAVE (); g_main_iteration (TRUE); - gdk_threads_enter (); } pthread_join (wdata->tid, &ret); teardown_wakeup_main_thread (wdata->request, handler); @@ -450,9 +450,8 @@ while (transfer->fromreq->stopable) { - gdk_threads_leave (); + GDK_THREADS_LEAVE (); g_main_iteration (TRUE); - gdk_threads_enter (); } gtk_timeout_remove (timeout_num); @@ -1208,7 +1207,6 @@ pthread_mutex_destroy (tdata->structmutex); pthread_mutex_destroy (tdata->statmutex); free_tdata (tdata); - fix_display (); }
--- a/src/gtk/view_dialog.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/gtk/view_dialog.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-gtk.h" +static const char cvsid[] = "$Id$"; static gftp_viewedit_data * fork_process ( char *proc, char *filename,
--- a/src/text/gftp-text.c Thu Oct 03 12:06:18 2002 +0000 +++ b/src/text/gftp-text.c Mon Oct 07 10:40:43 2002 +0000 @@ -18,6 +18,7 @@ /*****************************************************************************/ #include "gftp-text.h" +static const char cvsid[] = "$Id$"; static gftp_request * gftp_text_locreq = NULL; static gftp_request * gftp_text_remreq = NULL;
--- a/src/text/gftp-text.h Thu Oct 03 12:06:18 2002 +0000 +++ b/src/text/gftp-text.h Mon Oct 07 10:40:43 2002 +0000 @@ -17,6 +17,8 @@ /* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /*****************************************************************************/ +/* $Id$ */ + #ifndef __GFTP_TEXT_H #define __GFTP_TEXT_H